Merge branch 'fix-pr7988' into maint

* fix-pr7988:
  docs: don't suggest installing `.m4' files in hard-coded location

diff --cc ChangeLog
index 7468680,12cdb6e..ebbc7ad
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,43 -1,15 +1,55 @@@
+ 2011-09-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: don't suggest installing `.m4' files in hard-coded location
+       This change fixes automake bug#7988.
+       * doc/automake.texi (aclocal Options): State that the use of
+       the `--print-ac-dir' option to determine the directory where
+       third-party packages can install their `.m4' files is discouraged
+       now.
+       (Extending aclocal): Suggest telling the user about ACLOCAL_PATH.
+       * THANKS: Update.
+       Report by Peter Johansson.
+ 
 +2011-09-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      distuninstallcheck: fail also when only one file is left installed
 +      This change fixes automake bug#9579.
 +      * lib/am/distdir.am (distuninstallcheck): Be stricter in ignoring
 +      a potential `dir' file created by install-info and left installed.
 +      Also, be more careful about "this can't happen" kind of errors.
 +      (am__distuninstallcheck_listfiles): New internal helper macro.
 +      * tests/distcheck-pr9579.test: New test.
 +      * tests/distcheck-override-infodir.test: Likewise.
 +      * tests/Makefile.am (TESTS): Add them.
 +      * NEWS, THANKS: Update.
 +      Report by Nick Bowler.
 +
 +2011-09-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maintcheck: fix usage of `cd' instead of `$(am__cd)'
 +      * lib/am/inst-vars.am (am__uninstall_files_from_dir): Use
 +      `$(am__cd)', not plain `cd'.
 +
 +2011-09-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      uninstall: "make uninstall" before "make install" works
 +      This change fixes automake bug#9578.
 +      * lib/am/inst-vars.am (am__uninstall_files_from_dir): New internal
 +      macro, that defines a shell code fragment to uninstall files from
 +      a given directory.
 +      * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use it, to reduce code
 +      duplication and improve consistency and correctness.
 +      * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
 +      * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
 +      * lib/am/mans.am (uninstall-man%SECTION%): Likewise.
 +      * lib/am/python.am (uninstall-%DIR%LIBRARIES): Likewise.
 +      * lib/am/scripts.am (uninstall-%DIR%SCRIPTS): Likewise.
 +      * tests/uninstall-pr9578.test: New test.
 +      * tests/uninstall-fail.test: New test.
 +      * tests/Makefile.am (TESTS): Add them.
 +      * NEWS, THANKS: Update.
 +      Report by Nick Bowler.
 +
  2011-09-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix tests on aclocal search path precedences

diff --cc THANKS
Simple merge