Merge branch 'maint' into parallel-tests-maint

* maint:
  maintcheck: fix some failures, extend some checks
  automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
  remake: behave better with non-GNU make in subdirectories
  tests/README: fix example about `make -e' usage

diff --cc ChangeLog
index 6ec063dcd763b7a36f5c25ac8d657f5bd6051ca3,cb9918fc2a6bc04a2078a7766e496302f7d838ac..64cd2dc8c89b17bd82f609e4ebd934d20398f60b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,91 +1,100 @@@
+ 2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: fix some failures, extend some checks
+       * Makefile.am (sc_diff_automake_in_automake): Update, as we
+       now expect 9 lines, not 8, to be changed from `automake.in'
+       to `automake'.
+       (sc_diff_aclocal_in_aclocal): New maintainer check, similar to
+       the above, and checking that only 10 lines are changed from
+       `aclocal.in' to `aclocal'.
+       (syntax_check_rules): Update.
+       (sc_tests_Exit_not_exit): Exempt self tests `self-check-*.test'
+       from this check, as they can legitimately use the bare `exit'
+       builtin in various places.
+       * doc/automake.texi (Python): Remove stray `@' from the end of
+       a line.  Typo introduced in commit `v1.11-312-g5bf7af6'.
+       * tests/depcomp8a.test: Pass DISTCHECK_CONFIGURE_FLAGS to make
+       from the environment rather than from the command line, to
+       pacify the `sc_tests_overriding_macros_on_cmdline' maintainer
+       check.
+       * tests/depcomp8b.test: Likewise.
+ 
+ 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       remake: behave better with non-GNU make in subdirectories
+       Currently, with every decent make program, it is possible to
+       rebuild out-of-date autotools-generated files with a simple
+       "make Makefile" -- but for this to work reliably with non-GNU
+       make implementations, the command must be issued from the
+       top-level directory.  This patch removes such limitation.
+       * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
+       * tests/defs.in (using_gmake): New function, backported from the
+       `master' branch (and simplified).
+       * tests/remake-subdir.test: New test.
+       * tests/remake-subdir2.test: Likewise.
+       * tests/remake-subdir-gnu.test: Likewise.
+       * tests/remake-subdir-from-subdir.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
+       Currently, the Automake's own configure script allow definition
+       of AUTOCONF and AUTOM4TE, expected to point respectively to an
+       autoconf and autom4te programs.  But while these definitions are
+       honoured in the Automake's build systems and test suite, they
+       were *not* honoured in the generated `automake' and `aclocal'
+       scripts.  This behaviour, apart from being wrong in that it does
+       not allow the user enough freedom in choosing his tools, also
+       caused inconsistencies in the test suite, brining to spurious
+       failures.
+       Problem reported by Graham Reitz on the automake list; see thread:
+       <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>
+       * automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'.
+       * aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'.
+       * Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and
+       `@am_AUTOM4TE'.
+       * NEWS: Update.
+       * THANKS: Update.
+ 
+ 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
+       Our build system allows the user to override AUTOCONF and AUTOHEADER
+       at configure time, and honours these overrides in our testsuite.
+       But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
+       This change fixes that inconsistency.
+       * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
+       AC_SUBSTitutions.  Update comments.
+       * tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now.
+       ($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'.
+       ($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'.
+       * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
+ 
+ 2011-05-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests/README: fix example about `make -e' usage
+       * tests/README (Section "Writing test cases" subsection "Do"): When
+       some variable is never initialized in the Makefile, `-e' is not
+       necessary in order to override it.  DESTDIR is such a variable: we
+       ensure that we do not ever initialize it.  And as such, it is quite
+       portable to use:
+         $ make DESTDIR=/foo/bar install
+       and in fact, quite widely used.
+       So our example about when `make -e' is required, which references
+       the `DESTDIR' variable, is poorly chosen, if not downright wrong.
+       Rewrite it to use `prefix' as the overridden variable instead.
+ 
 +2011-05-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
 +      * tests/parallel-tests-harderror.test: New test, doing more
 +      in-depth checks on DISABLE_HARD_ERRORS.
 +      * tests/parallel-tests.test: Remove tests on DISABLE_HARD_ERRORS,
 +      now redundant.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-05-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        testsuite: avoid re-running few tests with 'parallel-tests' option

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge