Merge branch 'master' into ng/master

* master:
  AM_INIT_AUTOMAKE: allow obsolescent two-args invocation once again
  docs: don't suggest to use recursive makefile setup
  tests: fix a timestamp race in python tests
  tests: fixup: make distcheck-override-infodir pass again
  sync: update files from upstream with "make fetch"
  maint: post-release minor version bump
  release: stable release 1.12.3
  maintcheck: fix spurious warnings
  docs: fix typo: s/make install-info/make uninstall-info/
  tests: fixup: make a couple of tests executable

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

diff --cc doc/automake-ng.texi
index 0970069f0f7fe1e56d62ee47c9b01c952a3e18b2,7b62dcb0cc5618d2ee0375ce9c26e161516f4ef7..63a1a92a71e6f394c96dbbf10a9e8a07087e1f68
--- 1/doc/automake-ng.texi
--- 2/doc/automake.texi
+++ b/doc/automake-ng.texi
@@@ -416,18 -414,14 +416,16 @@@ the GNU Makefile standards
  
  The GNU Makefile Standards Document
  (@pxref{Makefile Conventions, , , standards, The GNU Coding Standards})
 -is long, complicated, and subject to change.  The goal of Automake is to
 -remove the burden of Makefile maintenance from the back of the
 -individual GNU maintainer (and put it on the back of the Automake
 +is long, complicated, and subject to change.  The goal of Automake-NG
 +is to remove the burden of Makefile maintenance from the back of the
 +individual GNU maintainer (and put it on the back of the Automake-NG
  maintainers).
  
 -The typical Automake input file is simply a series of variable definitions.
 -Each such file is processed to create a @file{Makefile.in}.
 +The typical Automake-NG input file is simply a series of variable
 +definitions. Each such file is processed to create a @file{Makefile.in}.
- There should generally be one @file{Makefile.am} per directory of a
- project.
  
 +@cindex Constraints of Automake-NG
 +@cindex Automake-NG constraints
  @cindex Constraints of Automake
  @cindex Automake constraints
  

diff --cc m4/init.m4
Simple merge

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

diff --cc t/backcompat.sh
index 0000000000000000000000000000000000000000,fa83687631399f4b97e13408c1fbba60e27a6948..214515d1740e906d99039e516332375ae9800608
mode 000000,100755..100755
--- /dev/null
--- 2/t/backcompat.sh
+++ b/t/backcompat.sh
@@@ -1,0 -1,64 +1,64 @@@
 -    unindent > configure.in <<END
+ #! /bin/sh
+ # Copyright (C) 2010-2012 Free Software Foundation, Inc.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ # Test usage of AM_INIT_AUTOMAKE with two or three arguments, for
+ # backward-compatibility.
+ 
+ . ./defs || exit 1
+ 
+ cat > Makefile.am <<'END'
+ .PHONY: test display
+ 
+ ## Might be useful for debugging.
+ display:
+ ## The following should be substituted by AM_INIT_AUTOMAKE.
+       @echo PACKAGE = $(PACKAGE)
+       @echo VERSION = $(VERSION)
+ ## The following should not be substituted, as we used the
+ ## old form of AC_INIT.
+       @echo PACKAGE_NAME = $(PACKAGE_NAME)
+       @echo PACKAGE_VERSION = $(PACKAGE_VERSION)
+       @echo PACKAGE_TARNAME = $(PACKAGE_TARNAME)
+       @echo PACKAGE_STRING = $(PACKAGE_STRING)
+ 
+ test: display
+       test x'$(PACKAGE)' = x'FooBar'
+       test x'$(VERSION)' = x'0.7.1'
+       test x'$(PACKAGE_NAME)' = x
+       test x'$(PACKAGE_VERSION)' = x
+       test x'$(PACKAGE_TARNAME)' = x
+       test x'$(PACKAGE_STRING)' = x
+ END
+ 
+ for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do
+   for am_extra_args in '' ', []' ', [:]' ', [false]'; do
+     rm -rf autom4te*.cache config* Makefile.in Makefile
 -    cat configure.in # For debugging.
++    unindent > configure.ac <<END
+       $ac_init
+       AM_INIT_AUTOMAKE([FooBar], [0.7.1]$am_extra_args)
+       AC_CONFIG_FILES([Makefile])
+       AC_OUTPUT
+ END
++    cat configure.ac # For debugging.
+     $ACLOCAL
+     $AUTOCONF
+     $AUTOMAKE -Wno-obsolete
+     ./configure
+     $MAKE test
+   done
+ done
+ 
+ :

diff --cc t/distcheck-override-infodir.sh
Simple merge