Merge branch 'master' into testsuite-work

* master:
  maintcheck: avoid few spurious failures

diff --cc ChangeLog
index e1a774c,cb1c290..83bae8d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,11 +1,27 @@@
  2011-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +      maintcheck: avoid few more spurious failures
 +      * tests/depmod-data.test: Use creative quoting to avoid
 +      spuriously triggering the `sc_tests_Exit_not_exit' maintainer
 +      check.  Commit `v1.11-900-g3453b8e' attempted to fix it, but
 +      succeeded only partially.
 +      * tests/cond33.test: Fix header comments, not to reference
 +      obsolescent make variable `$(mkdir_p)'.
 +      * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e",
 +      to please `sc_tests_overriding_macros_on_cmdline'
 +      * tests/cond19.test: Likewise.
 +      * tests/cond32.test: Likewise.
 +      * tests/add-missing.test: Use "AUTOMAKE_fails" instead of
 +      "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'.
 +
++2011-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
+       maintcheck: avoid few spurious failures
+       * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl,
+       sc_tests_plain_autoconf, sc_tests_plain_automake,
+       sc_tests_plain_autoupate): Be stricter in matching an erroneous
+       literal command, i.e., `aclocal', `automake', `perl', etc.
+ 
  2011-06-20  Bert Wesarg <bert.wesarg@googlemail.com>  (tiny change)
  
        check: don't use multi-line coloring for the report

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge