Merge branch 'fix-pr9773' into maint

* fix-pr9773:
  info: allow user to inhibit creation/update of '${infodir}/dir'

diff --cc ChangeLog
index 39c661c,44d77f8..d6f4bfc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,28 +1,42 @@@
+ 2011-10-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       info: allow user to inhibit creation/update of '${infodir}/dir'
+       With this change, we allow the user to request the install-info
+       rules not to update the `${infodir}/dir' file, by exporting the
+       environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+       This is especially useful to distro packagers, and is a definite
+       improvement over our previous hack of looking whether the
+       `install-info' program was the Debian or GNU version -- hack
+       which had been silently broken with recent versions of debian
+       install-info BTW (probably since dpkg 1.15.4, 2009-09-06).
+       This change fixes automake bug#9773.  See also Debian Bug#543992.
+       * lib/am/texinfos.am: Don't look anymore at the output of
+       `install-info --version' to decide whether to use it to update
+       the `${infodir}/dir' or not; instead, honour the environment
+       variable `AM_UPDATE_INFO_DIR'.
+       * tests/install-info-dir.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
+       interferences from the environment.
+       * doc/automake.texi (Texinfo): Update.
+       * NEWS: Likewise.
+       * THANKS: Likewise.
+       Report by Jonathan Nieder.
+ 
 +2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      deps: partially revert commit `v1.11-512-geeee551'
 +      This change partly reverts commit "Create subdirs for generated
 +      sources even when not dep tracking", of 2011-04-02.
 +      That commit had caused the bugs #8485 and #8526.  Since we are
 +      nearing the bug-fixing automake release 1.11.2, the safest policy
 +      at the moment is to just revert the problematic hunks: an older,
 +      known bug is better than a regression.
 +      * automake.in (handle_single_transform): Don't add a dirstamp
 +      dependency, even when $object is derived and lands in a subdir.
 +      * tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test,
 +      remove yacc-dist-nobuild-subdir.test.
 +
  2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        dejagnu: allow the package developer to extend site.exp

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge