Merge branch 'maint' into branch-1.11

* maint:
  tests: drop unnecessary requirement in 'subpkg.test'
  gitlog-to-changelog: new auxiliary script, synced from gnulib
  docs: "aclocal --install -I /abs/dir" actually copies files
  docs: fix node names for automake and aclocal invocations

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index a955b69,f6eb29f..ec44485
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,29 -1,4 +1,35 @@@
 -New in 1.11.0a:
 +New in 1.11.2a:
 +
 +* WARNING: Future backward-incompatibilities!
 +
 +  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
 +    GNU rx library has been decommissioned), and will be removed in the
 +    next major Automake release (1.12).
 +
 +* Miscellaneous changes:
 +
++  - In the Automake info documentation, the Top node and the nodes about
++    the invocation of the automake and aclocal programs have been renamed;
++    now, calling "info automake" will open the Top node, while calling
++    "info automake-invocation" and "info aclocal-invocation" will access
++    the nodes about the invocation of respectively automake and aclocal.
++
 +  - Automake is now distributed as a gzip-compressed and an xz-compressed
 +    tarball.  Previously, bzip2 was used instead of xz.
 +
 +  - The last relics of Python 1.5 support have been removed from the
 +    AM_PATH_PYTHON macro.
 +
 +Bugs fixed in 1.11.2a:
 +
 +* Long-standing bugs:
 +
 +  - The "deleted header file problem" for *.am files is avoided by stub
 +    rules.  This allows `make' to trigger a rerun of `automake' also if
 +    some previously needed `.am' file has been removed.
 +
 +\f
 +New in 1.11.2:
  
  * WARNING: Future backward-incompatibilities!
  

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Makefile.am
index 5bdc02e,4102828..f4acc8a
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -29,9 -28,9 +29,9 @@@ dist_pkgvdata_DATA = COPYING INSTALL te
  scriptdir = $(pkgvdatadir)
  dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
    mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
 -  symlink-tree
 +  symlink-tree ar-lib
  
- EXTRA_DIST = gnupload
+ EXTRA_DIST = gnupload gitlog-to-changelog
  
  install-data-hook:
        @$(POST_INSTALL)

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/subpkg.test
Simple merge