Merge branch 'master' into ng/master

* master:
  fixup: avoid unconditional re-bootstrapping on "make dist"
  build: ensure release year in copyright notice is up-to-date
  cosmetics: fix spacing in THANKS
  readme: explicitly state we use ranges in copyright years
  aclocal: remove the --acdir option
  bootstrap: add convenience make target
  m4: delete several obsolete macros
  automake, aclocal: update copyright year in output
  maint: don't use "union" merge driver for NEWS anymore
  build: avoid too greedy rebuilds in the testsuite
  tests: avoid yet another spurious environment influence
  tests: fix a failure in Lex/C++ tests on Mac OS X
  tests: fix a spurious failure due to truncated timestamps
  build: require autoconf 2.69
  build: don't require minimal automake version in AM_INIT_AUTOMAKE
  post-release: major version bump
  post-release: minor version bump
  release: stable major release 1.12
  tests: cater to systems installing libs in /lib64
  tests: fix spurious failure on Mac OS X

diff --cc GNUmakefile
Simple merge

diff --cc Makefile.am
index fafe586a9702888ed39f3e4d99a452f372c5690f,495a02a4d9f86893c05c69b2667b0a635ec1fd75..bc8d5575f54ee406d715d4858b0d1607c44a4c12
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -67,23 -67,10 +67,23 @@@ TAGS_FILES = $(AUTOMAKESOURCES
  
  EXTRA_DIST += \
    $(AUTOMAKESOURCES) \
-   bootstrap \
+   bootstrap.sh \
    GNUmakefile \
    syntax-checks.mk \
 -  HACKING
 +  HACKING \
 +  NG-NEWS \
 +  $(gitlog_to_changelog_fixes) \
 +  old/ChangeLog-tests \
 +  old/ChangeLog.96 \
 +  old/ChangeLog.98 \
 +  old/ChangeLog.00 \
 +  old/ChangeLog.01 \
 +  old/ChangeLog.02 \
 +  old/ChangeLog.03 \
 +  old/ChangeLog.04 \
 +  old/ChangeLog.09 \
 +  old/ChangeLog.11 \
 +  old/TODO
  
  ## Make versioned links.  We only run the transform on the root name;
  ## then we make a versioned link with the transformed base name.  This
@@@ -277,10 -264,9 +277,8 @@@ dist_automake_ac_DATA = 
    m4/cond.m4 \
    m4/cond-if.m4 \
    m4/depend.m4 \
 -  m4/depout.m4 \
    m4/dmalloc.m4 \
    m4/gcj.m4 \
-   m4/header.m4 \
    m4/init.m4 \
    m4/install-sh.m4 \
    m4/lead-dot.m4 \
@@@ -420,16 -351,34 +415,19 @@@ AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC
  AM_TESTS_FD_REDIRECT = 9>&2
  AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
  
 -# Hand-written tests.
 -
 -include $(srcdir)/t/list-of-tests.mk
 -
 -TESTS += $(handwritten_TESTS)
 -EXTRA_DIST += $(handwritten_TESTS)
 -
 -# Automatically-generated tests wrapping hand-written ones.
 -# Also, automatically-computed dependencies for tests.
 -
 -include $(srcdir)/t/testsuite-part.am
 -
 -TESTS += $(generated_TESTS)
 -EXTRA_DIST += $(generated_TESTS)
 -
 -$(srcdir)/t/testsuite-part.am:
 -      $(AM_V_at)rm -f t/testsuite-part.tmp $@
 -      $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
 -        --srcdir $(srcdir) > t/testsuite-part.tmp
 -      $(AM_V_at)chmod a-w t/testsuite-part.tmp
 -      $(AM_V_at)mv -f t/testsuite-part.tmp $@
 -EXTRA_DIST += gen-testsuite-part
 +# Automatically-computed dependencies for tests.
 +include $(srcdir)/testsuite-autodeps.am
  
 -$(generated_TESTS): $(srcdir)/gen-testsuite-part
 -$(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am
+ ## The dependecies declared here are not truly complete, but such
+ ## completeness would cause more issues than it would solve.  See
+ ## automake bug#11347.
 +$(srcdir)/autodeps.am: $(srcdir)/gen-testsuite-part
 +      $(AM_V_at)rm -f testsuite-autodeps.tmp $@
 +      $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part
 +        --srcdir $(srcdir) > testsuite-autodeps.tmp
 +      $(AM_V_at)chmod a-w testsuite-autodeps.tmp
 +      $(AM_V_at)mv -f testsuite-autodeps.tmp $@
 +EXTRA_DIST += gen-testsuite-part
  
  # Static dependencies valid for each test case.
  check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)

diff --cc README
Simple merge

diff --cc automake.in
Simple merge

diff --cc bootstrap.sh
Simple merge

diff --cc configure.ac
index 0a48a7ffd2a18f059099bfd445f65bb2e0977797,b671227327f36033a6251dc211d1120d46b14815..25208bdede9d20583b842ae08ec58b66be357cd1
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -15,8 -15,8 +15,8 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
- AC_PREREQ([2.68])
- AC_INIT([GNU Automake-NG], [1.11e], [automake-ng@gnu.org])
+ AC_PREREQ([2.69])
 -AC_INIT([GNU Automake], [1.12a], [bug-automake@gnu.org])
++AC_INIT([GNU Automake-NG], [1.12a], [automake-ng@gnu.org])
  
  AC_CONFIG_SRCDIR([automake.in])
  AC_CONFIG_AUX_DIR([lib])
@@@ -40,7 -40,12 +40,12 @@@ dnl We call AC_PROG_CC in an unusual wa
  dnl testsuite, so also use 'no-dependencies' and 'no-define' among
  dnl the automake options to avoid bloating and potential problems.
  AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
-                 parallel-tests no-define no-dependencies])
 -                parallel-tests silent-rules no-define no-dependencies])
++                  parallel-tests no-define no-dependencies])
+ 
+ ## Keep this on a line of its own, since it must be found and processed
+ ## by the 'update-copyright' rule in out Makefile.
+ RELEASE_YEAR=2012
+ AC_SUBST([RELEASE_YEAR])
  
  # The API version is the base version.  We must guarantee
  # compatibility for all releases with the same API version.

diff --cc doc/automake.texi
Simple merge

diff --cc t/lex-depend-cxx.sh
Simple merge

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

diff --cc t/posixsubst-libraries.sh
index 5f32d4f57182dcfb145b6e62a415aa337e102e68,f437571b9accc14c5a0529f8a453730a332b7855..8d54820869b9512e5cd283734cab798df227f0b3
--- 1/t/posixsubst-libraries.sh
--- 2/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@@ -38,12 -38,13 +38,12 @@@ lib_LIBRARIES = $(foolibs:=.a) $(barlib
  
  libbar.c:
        echo 'int bar(void) { return 0; }' > $@
 -CLEANFILES = libbar.c # For FreeBSD make.
  
  installcheck-local:
-       ls -l $(prefix)/lib
-       test -f $(prefix)/lib/libfoo1.a
-       test -f $(prefix)/lib/libfoo2.a
-       test -f $(prefix)/lib/libbar.a
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.a
+       test -f $(libdir)/libfoo2.a
+       test -f $(libdir)/libbar.a
  END
  
  echo 'int bar1(void) { return 0; }' > libfoo1.c

diff --cc t/posixsubst-ltlibraries.sh
index e3a128fa9645dd755e9051d3eb26bbb7bcea1e98,b4b2a925da3ff145598bfb4e79f080c7771fca34..e235984bf39ddc3ded8c1462690a2b9a07a5b77f
--- 1/t/posixsubst-ltlibraries.sh
--- 2/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@@ -38,12 -38,13 +38,12 @@@ lib_LTLIBRARIES = $(foolibs:=.la) $(bar
  
  libbar.c:
        echo 'int bar(void) { return 0; }' > $@
 -CLEANFILES = libbar.c # For FreeBSD make.
  
  installcheck-local:
-       ls -l $(prefix)/lib
-       test -f $(prefix)/lib/libfoo1.la
-       test -f $(prefix)/lib/libfoo2.la
-       test -f $(prefix)/lib/libbar.la
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.la
+       test -f $(libdir)/libfoo2.la
+       test -f $(libdir)/libbar.la
  END
  
  echo 'int bar1(void) { return 0; }' > libfoo1.c