From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 9 Jan 2013 12:15:28 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb3f36e4590900830e7cba59516921704f6ee9d2;p=thirdparty%2Fautomake.git

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>
---

bb3f36e4590900830e7cba59516921704f6ee9d2
diff --cc Makefile.am
index 2ab657a50,463cb535b..f60033e92
--- a/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