Merge branch 'fix-pr9579' into maint

* fix-pr9579:
  distuninstallcheck: fail also when only one file is left installed

diff --cc ChangeLog
index c3b041d,875245f..7468680
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,29 -1,17 +1,43 @@@
+ 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 Makefile.in
Simple merge

diff --cc NEWS
index 54838d0,df8fb5a..4fe4196
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -61,10 -61,9 +61,13 @@@ Bugs fixed in 1.11.0a
  
  * Long standing bugs:
  
+   - "make distcheck" now correctly complains also when "make uninstall"
+     leaves one and only one file installed in $(prefix).
+ 
 +  - A "make uninstall" issued before a "make install", or after a mere
 +    "make install-data" or a mere "make install-exec" does not spuriously
 +    fail anymore.
 +
    - Automake now warns about more primary/directory invalid combinations,
      such as "doc_LIBRARIES" or "pkglib_PROGRAMS".
  

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge