Merge branch 'rmch'

* rmch:
  maint: simplify generation of files with @substed@ stuff
  t/README: update w.r.t. recent overhaul (non-recursive build system)
  docs: fix names of relevant test cases in comments
  NEWS: automake build systems avoids make recursion
  maint: no more make recursion in Automake's build system
  tests: rename 'tests/' => 't/', '*.test' => '*.sh'
  tests: remove recipes that run tests with 'prove'
  tests: move most helper scripts and files into the 'ax' subdirectory

diff --cc t/README
Simple merge

diff --cc t/install-info-dir.sh
Simple merge

diff --cc t/instdir-cond.sh
index 2965ff19d74e33867a80b5cd818772764b3c1308,2965ff19d74e33867a80b5cd818772764b3c1308..2965ff19d74e33867a80b5cd818772764b3c1308
mode 100755,100644..100755
--- 1/tests/instdir-cond.test
--- 2/t/instdir-cond.sh
+++ b/t/instdir-cond.sh

diff --cc t/instdir-cond2.sh
index 1fc24b70d8c618c799ec3b78b767d59998c3a9bc,1fc24b70d8c618c799ec3b78b767d59998c3a9bc..1fc24b70d8c618c799ec3b78b767d59998c3a9bc
mode 100755,100644..100755
--- 1/tests/instdir-cond2.test
--- 2/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh

diff --cc t/lex-clean-cxx.sh
Simple merge

diff --cc t/lex-depend-cxx.sh
Simple merge

diff --cc t/txinfo19.sh
Simple merge