Merge branch 'master' into ng/master

* master: (38 commits)
  tests: fix a spurious failure with older flex versions
  tests: avoid a failure due to m4 builtin 'sinclude' in package name
  tests: fix a spurious failure when $PYTHON is in the environment
  python tests: support PEP-3147 installation layout
  python: uninstall cater to PEP-3147
  tests: more explicative names for few aclocal tests
  tests: improve coverage on Texinfo + silent rules
  build: fix rebuild rules for Makefile.in and aclocal.m4
  hacking: release procedure: fix order of some steps
  maint: post-release minor version bump
  release: stable release 1.12.5
  maintcheck: avoid failures, sync with 'ng/master' more
  maintcheck: remove 'sc_perl_syntax'
  sync: update files from upstream with "make fetch"
  maint: get rid of $perllibdir environment variable hack
  configure: respect the '-q' option better
  cosmetics: de-tabify configure.ac
  fixup: Automake installation works again
  tests: AC_CONFIG_MACRO_DIRS: ignore inevitable failures with old autoconf
  recursion: remove _AM_EXTRA_RECURSIVE_TARGETS indirection
  ...

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

diff --cc HACKING
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc aclocal.in
index cb50e429ff7b1b298964967cee64d2d7b737f00b,05b89e7e345cd0dd150c09aa6892516409add92e..653528a9ef4c0785bed2f5930abafad42910aef9
--- 1/aclocal.in
--- 2/aclocal.in
+++ b/aclocal.in
@@@ -44,6 -46,19 +45,16 @@@ use File::Path ()
  
  # Some globals.
  
 -# We do not operate in threaded mode.
 -$perl_threads = 0;
 -
+ # Support AC_CONFIG_MACRO_DIRS also with older autoconf.
+ # FIXME: To be removed in Automake 1.14, once we can assume autoconf
+ #        2.70 or later.
+ # FIXME: keep in sync with 'internal/ac-config-macro-dirs.m4'.
+ my $ac_config_macro_dirs_fallback =
+   'm4_ifndef([AC_CONFIG_MACRO_DIRS], [' .
+     'm4_defun([_AM_CONFIG_MACRO_DIRS], [])' .
+     'm4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])' .
+   '])';
+ 
  # Include paths for searching macros.  We search macros in this order:
  # user-supplied directories first, then the directory containing the
  # automake macros, and finally the system-wide directories for

diff --cc automake.in
index 66068539878f675995643f9aad0d7ff8275610e4,3194c994888e3785e09eee5cbd16bedd20745685..5820c51719e28eb6831e059e8c031ff41a6af396
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -29,8 -29,18 +29,9 @@@ package Language
  
  BEGIN
  {
-   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+   @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
+     unless @Automake::perl_libdirs;
+   unshift @INC, @Automake::perl_libdirs;
 -
 -  # Override SHELL.  This is required on DJGPP so that system() uses
 -  # bash, not COMMAND.COM which doesn't quote arguments properly.
 -  # Other systems aren't expected to use $SHELL when Automake
 -  # runs, but it should be safe to drop the "if DJGPP" guard if
 -  # it turns up other systems need the same thing.  After all,
 -  # if SHELL is used, ./configure's SHELL is always better than
 -  # the user's SHELL (which may be something like tcsh).
 -  $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
  }
  
  use Class::Struct ();
@@@ -4174,8 -5129,9 +4175,8 @@@ sub scan_autoconf_traces ($
                AC_REQUIRE_AUX_FILE => 1,
                AC_SUBST_TRACE => 1,
                AM_AUTOMAKE_VERSION => 1,
 -                AM_PROG_MKDIR_P => 0, # FIXME: to be removed in 1.14
                AM_CONDITIONAL => 2,
-               _AM_EXTRA_RECURSIVE_TARGETS => 1,
+               AM_EXTRA_RECURSIVE_TARGETS => 1,
                AM_GNU_GETTEXT => 0,
                AM_GNU_GETTEXT_INTL_SUBDIR => 0,
                AM_INIT_AUTOMAKE => 0,

diff --cc configure.ac
index 8c19d1000f875ec7db545cfc88fb1d76c754e007,de218daa951d348217d68567203c29283f3ca6e0..9cd6aeb35d33cbdc9968d83cd9c6bc3a88d776d5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -601,9 -628,10 +597,10 @@@ am_release_type=`AS_ECHO(["$PACKAGE_VER
    /^$am_beta_version_rx$/ { print \"beta version\"; exit(0); }
    { print \"development snapshot\"; }"]`
  
- test "$am_release_type" = stable || cat <<EOF
+ # '$silent' is set to yes if configure is passed the '--quiet' option.
+ test "$am_release_type" = stable || test "$silent" = yes || cat <<EOF
  
 -WARNING: You are about to use a $am_release_type of automake.
 +WARNING: You are about to use a $am_release_type of Automake-NG.
  WARNING: It might easily suffer from new bugs or regressions.
  WARNING: You are strongly advised not to use it in production code.
  

diff --cc doc/automake-ng.texi
Simple merge

diff --cc lib/am/python.am
index fb5ae50015636107d435eb87f02f986a813dc82d,143245e87e6c104d513e7f9213615cbeedb211a5..3be4be570bdc99dccaba58149205efb2888f0c9c
--- 1/lib/am/python.am
--- 2/lib/am/python.am
+++ b/lib/am/python.am
@@@ -78,12 -98,37 +78,16 @@@ if %?INSTALL
  .PHONY uninstall-am: uninstall-%DIR%PYTHON
  uninstall-%DIR%PYTHON:
        @$(NORMAL_UNINSTALL)
 -      @list='$(%DIR%_PYTHON)'; test -n "$(%NDIR%dir)" || list=; \
 -?BASE?        py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 -?!BASE?       $(am__nobase_strip_setup); py_files=`$(am__nobase_strip)`; \
 -      test -n "$$py_files" || exit 0; \
 -      dir='$(DESTDIR)$(%NDIR%dir)'; \
 -## Also remove the .pyc and .pyo byte compiled versions.
 -## This is somewhat tricky, because for newer pythons we have to take
 -## PEP-3147 into account.
 -      pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
 -      pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
 -      py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
 -      echo "$$py_files_pep3147";\
 -      pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
 -      pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
 -      st=0; \
 -      for files in \
 -        "$$py_files" \
 -        "$$pyc_files" \
 -        "$$pyo_files" \
 -## Installation of '.py' files is not influenced by PEP-3147, so it
 -## is correct *not* to have $pyfiles_pep3147 here.
 -        "$$pyc_files_pep3147" \
 -        "$$pyo_files_pep3147" \
 -      ; do \
 -        $(am__uninstall_files_from_dir) || st=$$?; \
 -      done; \
 -      exit $$st
 +      $(call am.uninst.cmd,$(%NDIR%dir), \
-         $(foreach i,\
- ?BASE?            $(notdir $(%DIR%_PYTHON)), \
- ?!BASE?           $(patsubst $(srcdir)/%,%,$(%DIR%_PYTHON)), \
- ## Also remove the '.pyc' and '.py'o byte-compiled versions.
-             $(i) $(i)c $(i)o))
++        $(strip $(foreach i, $(patsubst %.py,%, \
++?BASE?            $(notdir $(%DIR%_PYTHON))), \
++?!BASE?           $(patsubst $(srcdir)/%,%,$(%DIR%_PYTHON))), \
++            $i.py \
++## Also remove the '.pyc' and '.pyo' byte-compiled versions, catering
++## to PEP-3147.   Note that installation of '.py' files is *not*
++## influenced by that PEP.
++            $(foreach e, pyc pyo, \
++              $i.$e $(dir $i)__pycache__/$(notdir $i).*.$e))))
  endif %?INSTALL%
  
  

diff --cc lib/py-compile
Simple merge

diff --cc syntax-checks.mk
index c6d5521dd8a5acb42a31f0e7a5a4b26009070cce,a4dcdf208a94d69b3bf0bc8c545cb3a7e81b9e90..bc2faf8b11756efb8fbc2a9f79078b83c4562a96
--- 1/syntax-checks.mk
--- 2/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -92,10 -81,10 +91,10 @@@ sc_at_in_tex
  
  ## These check avoids accidental configure substitutions in the source.
  ## There are exactly 8 lines that should be modified from automake.in to
- ## automake, and 10 lines that should be modified from aclocal.in to
+ ## automake, and 9 lines that should be modified from aclocal.in to
  ## aclocal.
--automake_diff_no = 8
- aclocal_diff_no = 10
++automake_diff_no = 7
+ aclocal_diff_no = 9
  sc_diff_automake sc_diff_aclocal: sc_diff_% :
        @set +e; tmp=$*-diffs.tmp; \
         diff -u $(srcdir)/$*.in $* > $$tmp; test $$? -eq 1 || exit 1; \

diff --cc t/aclocal-deps.sh
Simple merge

diff --cc t/ax/am-test-lib.sh
Simple merge

diff --cc t/lex-header.sh
Simple merge

diff --cc t/python-virtualenv.sh
index e16ee2b0242b6924d89bf46d6d35e5ad0ed2da33,9c0ffcc00fe527802193cd2eb1be28e2a86b9661..dad88a688f52f3ec1139aff37fa87f0eec237210
--- 1/t/python-virtualenv.sh
--- 2/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@@ -161,17 -178,13 +178,11 @@@ $MAKE distclea
  
  # Overriding pythondir and pyexecdir at make time should be enough.
  ./configure --prefix="$cwd/bad-prefix"
 -pythondir=$py_site pyexecdir=$py_site
 -export pythondir pyexecdir
 -check_install -e
 +
- xMAKE () { $MAKE pythondir="$py_site" pyexecdir="$py_site" "$@"; }
- 
- export pythondir pyexecdir
- xMAKE install
++check_install pythondir="$py_site" pyexecdir="$py_site"
  test ! -e bad-prefix
- xMAKE test-install
- xMAKE test-run
- xMAKE uninstall
- xMAKE test-uninstall
 -$MAKE test-run
 -check_uninstall -e
--unset pythondir pyexecdir
++$MAKE test-run pythondir="$py_site" pyexecdir="$py_site"
++check_uninstall pythondir="$py_site" pyexecdir="$py_site"
  
  # Also check that the distribution is self-contained, for completeness.
  $MAKE distcheck

diff --cc t/silent-c.sh
Simple merge

diff --cc t/silent-cxx.sh
Simple merge

diff --cc t/silent-lt.sh
Simple merge

diff --cc t/silent-many-languages.sh
Simple merge

diff --cc t/silent-yacc.sh
Simple merge