Merge branch 'maint'

diff --cc ChangeLog
index 07808cd,48f0ce2..6bae147
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -11,34 -5,49 +11,77 @@@
        Ensure $< is not surrounded by white space, to prevent Solaris
        make from applying automatic VPATH text expansion.
  
+ 2011-01-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix spurious failures in yflags*.test
+       * tests/yflags.test: Remove 'YACC' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/yflags2.test: Likewise.
+ 
+ 2011-01-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       tests: avoid fn99*.test failures due to buggy AIX 5.3 cp -R.
+       * tests/fn99.test, tests/fn99subdir.test: Skip if an initial
+       `cp -R' of the subdir tree already fails; AIX 5.3 cp messes
+       up its internal memory when copying this tree.
+ 
+ 2011-01-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Add comment to check-TESTS rule working around make 3.80 bug.
+       * lib/am/check.am (check-TESTS): Update comment.
+ 
+ 2011-01-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       tests: less strict double-colon spy.test again.
+       * tests/spy.test: We know BSD make doesn't invoke more than one
+       double-colon rule, so no need to expose that failure.
+ 
+ 2011-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       install-sh: avoid Tru64 sh `test' operator precedence issues.
+       * lib/install-sh: Protect file names and directory components
+       that consist of `=', `(', `)', or `!'.  Move protection as early
+       as possible, to avoid errors such as with Tru64 sh `test -z ='.
+       * tests/instsh2.test: Extend test to cover more possibilities.
+       Fixes 1.12 instspc-equal-install.test failure on Tru64/OSF 5.1.
+ 
+ 2011-01-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       docs: automake testsuite doesn't use TESTS_ENVIRONMENT anymore
+       * doc/automake.texi (Simple Tests): Do not claim Automake uses
+       TESTS_ENVIRONMENT for the perl driver.  Instead, point to the
+       parallel-tests driver.
+ 
 +2011-01-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: check for presence of cscope with redirected input.
 +      * tests/defs: Add required test for cscope.
 +      Fixes cscope3.test hang with Sun C 5.9 cscope.
 +
 +      tests: avoid false failure in cygnus-dependency-tracking.test.
 +      * tests/cygnus-dependency-tracking.test: Be less restrictive
 +      when grepping the compiler error message, GCC 3.4.6 on FreeBSD
 +      does not mention an undefined symbol.
 +
 +2011-01-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: revert not turning off errexit in instspc-test.sh
 +      * tests/instspc-tests.sh: Turn off errexit while sourcing defs,
 +      the scripts might still not be clean.
 +
 +2011-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: work around Tru64 sh -e issues for instspc*.test.
 +      Apparently, Tru64 sh does not like turning off errexit mode,
 +      and gets confused.
 +      * tests/defs: Document 'errexit' cleanliness requirement.
 +      * tests/defs-static.in: Likewise.  Avoid error from command
 +      substitution to abort instspc*.test with Tru64/OSF 5.1 sh.
 +      * tests/instspc-tests.sh: Drop now-unneeded temporary errexit
 +      dropping.  Add strategic '|| Exit' to let tests work on Tru64.
 +
  2011-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Allow _AM_DEPENDENCIES to be used later in configure.

diff --cc doc/automake.texi
Simple merge

diff --cc tests/fn99.test
Simple merge

diff --cc tests/fn99subdir.test
Simple merge

diff --cc tests/instsh2.test
Simple merge

diff --cc tests/spy.test
Simple merge

diff --cc tests/yflags.test
Simple merge

diff --cc tests/yflags2.test
Simple merge