Merge branch 'master' into ng/master

* master:
  tests: adjust stale references to old test names
  tests: rename the last aclocal test with dumb name
  tests: fix an old botched change to an aclocal test
  tests: fix some botched inter-test references in heading comments
  coverage: compile rules used "-c -o" also with losing compilers
  texi: remove extra verbosity in creation of dirstamp directory
  coverage: user can avoid distributing '.info' pages
  texi: remove leftover support for DGJPP '.iNN' info files
  plans: add some on-going plans (already registered on the bug tracker)
  docs: mention dist-hook help for EXTRA_DIST
  texi: remove workaround for older Texinfo (4.1)
  NEWS: improve wordings in entry deprecating suffix-less info files
  plans: add the "PLANS" directory

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc Makefile.am
index 2ab657a507ae9143058f7fcfa9fd19e44116839f,463cb535b03528e9edb4916689851be79070df6b..f60033e92bc19c6aba6b27f5d1f935e8cc7acfad
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -61,8 -70,7 +61,9 @@@ EXTRA_DIST += 
    bootstrap.sh \
    GNUmakefile \
    HACKING \
 -  PLANS
 +  NG-NEWS \
++  PLANS \
 +  $(gitlog_to_changelog_fixes)
  
  # Make versioned links.  We only run the transform on the root name;
  # then we make a versioned link with the transformed base name.  This

diff --cc doc/automake-ng.texi
Simple merge

diff --cc t/remake-renamed-m4-macro-and-file.sh
Simple merge