Merge branch 'fix-pr9579' into maint

* fix-pr9579:
  maintcheck: fix spurious failure
  regenerate Makefile.in

diff --cc ChangeLog
index 019f2ac,bbea2b3..592dc46
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,44 -1,10 +1,51 @@@
  2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       maintcheck: fix spurious failure
+       * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
+       complaints from the `sc_no_brace_variable_expansions' maintainer
+       check.
+ 
++2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      fix: make a test script executable
 +      * tests/nobase-nodist.test: Make executable.
 +
 +2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      coverage: expose automake bug#9651
 +      * tests/dist-auxfile.test: New test, xfailing.
 +      * tests/dist-auxfile-2.test: Likewise.
 +      * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
 +
 +2011-10-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      parallel-tests: automake error our on invalid TEST_EXTENSIONS
 +      This change fixes automake bug#9400.
 +      * automake.in (handle_tests): Bail out if a suffix specified in
 +      TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER'
 +      variable or an invalid suffix rule.  Before this change, automake
 +      would have issued a confusing error messages (about invalid or
 +      non-POSIX variables being defined), and in some situations would
 +      have even produced a broken `Makefile.in' file.
 +      ($TEST_EXTENSION_PATTERN): New helper variable.
 +      * doc/automake.texi (Simple Tests using parallel-tests): Document
 +      the limitations on TEST_EXTENSIONS explicitly.
 +      * NEWS: Update.
 +      * tests/test-extensions.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +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

diff --cc Makefile.in
Simple merge