Merge branch 'info-in-builddir' into maint

* info-in-builddir:
  texi: deprecate hack about info files in CLEANFILES variables
  texi: info files can be generated in the builddir

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc NEWS
index 277141de054cac1317dd93e2fbe4a90c48d624e7,6fd1c7569ff4c625a522474e64b4bb5badac1683..b8106adcc78c0beb9400f7cd81e791902ef56d19
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -49,27 -49,35 +49,56 @@@ New in 1.13.2
      should take precedence over the same-named automake-provided macro
      (defined in '/usr/local/share/aclocal-1.14/vala.m4').
  
 +* Obsolescent features:
 +
 +  - Use of suffix-less info files (that can be specified through the
 +    '@setfilename' macro in Texinfo input files) is discouraged, and
 +    its use will raise warnings in the 'obsolete' category.
 +
 +  - Use of Texinfo input files with '.txi' or '.texinfo' extensions
 +    is discouraged, and its use will raise warnings in the 'obsolete'
 +    category.  You are advised to simply use the '.texi' extension
 +    instead.
 +
 +* Documentation fixes:
 +
 +  - The long-deprecated but still supported two-arguments invocation form
 +    of AM_INIT_AUTOMAKE is documented once again.  This seems the sanest
 +    thing to do, given that support for such an usage might need to remain
 +    in place for a unspecified amount of time in order to cater for people
 +    who want to define the version number for their package dynamically at
 +    configure runtime (unfortunately, Autoconf does not yet support this
 +    scenario, so we cannot delegate the work to it).
 +
+ * Texinfo support:
+ 
+   - Automake can now be instructed to place '.info' files generated from
+     Texinfo input in the builddir rather than in the srcdir; this is done
+     specifying the new automake option 'info-in-builddir'.  This feature
+     was requested by the developers of GCC, GDB, GNU binutils and the GNU
+     bfd library.  See the extensive discussion about automake bug#11034
+     for more details.
+ 
+   - For quite a long time, Automake has been implementing an undocumented
+     hack which ensured that '.info' files which appeared to be cleaned
+     (by e.g. being listed in the CLEANFILES or DISTCLEANFILES variables)
+     were built in the builddir rather than in the srcdir; this hack was
+     introduced to ensure better backward-compatibility with packages such
+     as Texinfo, which did things like:
+ 
+         info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
+         DISTCLEANFILES = texinfo texinfo-* info*.info*
+         # Do not create info files for distribution.
+         dist-info:
+             @:
+ 
+     in order not to distribute generated '.info' files.
+ 
+     Now that we have the 'info-in-builddir' option that explicitly causes
+     generated '.info' files to be placed in the builddir, this hack should
+     be longer necessary, so we deprecate it with runtime warnings.  It will
+     likely be removed altogether in Automake 1.14.
+ 
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  New in 1.13.1:

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc t/list-of-tests.mk
Simple merge