Merge branch 'maint'

diff --cc ChangeLog
index 977e08c,4346a0c..1464f06
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,40 -1,10 +1,47 @@@
  2011-04-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       maintainer check: quote literal `$' in Makefile rule
+       * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
+       character in double-quoted string.  Fix a bug in which the rule
+       emitted an erroneously empty substring in its error message.
+ 
++2011-04-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      tests: fix typo in python5b.test
 +      * tests/python5b.test: Remove extra `:' from $PATH redefinition.
 +
 +2011-04-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove redundant settings of `errexit' shell flag
 +      * tests/autodist-acconfig.test: Do not set the `errexit'
 +      shell flag, as it is already set by `tests/defs'.
 +      * tests/autodist-acconfig-no-subdir.test: Likewise.
 +      * tests/autodist-aclocal-m4.test: Likewise.
 +      * tests/autodist-config-headers.test: Likewise.
 +      * tests/autodist-configure-no-subdir.test: Likewise.
 +      * tests/autodist-stamp-vti.test: Likewise.
 +      * tests/autodist-subdir.test: Likewise.
 +      * tests/autodist.test: Likewise.
 +      * tests/check-exported-srcdir.test: Likewise.
 +      * tests/check-tests-in-builddir.test: Likewise.
 +      * tests/check-tests_environment.test: Likewise.
 +      * tests/help-python.test: Likewise.
 +      * tests/java-check.test: Likewise.
 +      * tests/java-extra.test: Likewise.
 +      * tests/java-noinst.test: Likewise.
 +      * tests/lex-subobj-nodep.test: Likewise.
 +      * tests/ltinit.test: Likewise.
 +      * tests/m4-inclusion.test: Likewise.
 +      * tests/maintclean-vpath.test: Likewise.
 +      * tests/parallel-tests-subdir.test: Likewise.
 +      * tests/pr8365-remake-timing.test: Likewise.
 +      * tests/python-dist.test: Likewise.
 +      * tests/python-vars.test: Likewise.
 +      * tests/python-virtualenv.test: Likewise.
 +      * tests/python5b.test: Likewise.
 +      * tests/specflg-dummy.test: Likewise.
 +      * tests/yacc-dist-nobuild-subdir.test: Likewise.
 +      
  2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        coverage: test for automake bug#8485 (known regression)

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
index e2f796f,49c35f5..9b976a7
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -1250,37 -1154,9 +1250,37 @@@ sc_tests_plain_egrep_fgrep
          exit 1; \
        fi
  
 +sc_ensure_testsuite_has_run:
 +      @if test ! -f tests/test-suite.log; then \
 +        echo "Run \`env keep_testdirs=yes make check' before \`maintainer-check'" >&2; \
 +        exit 1; \
 +      fi
 +.PHONY: sc_ensure_testsuite_has_run
 +
 +sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
 +      @if grep -E '(warning|error):.*(warning|error):' tests/*.log; then \
 +        echo 'Duplicate warning/error message prefixes seen in above tests.' >&2; \
 +        exit 1; \
 +      fi
 +
 +sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run
 +      @for file in `find tests -name Makefile.in -print`; do \
 +        latevars=`sed -n \
 +          -e :x -e 's/#.*//' \
 +          -e '/\\\\$$/{' -e N -e 'b x' -e '}' \
 +          -e '1,/^    /d' \
 +          -e '/^ *[a-zA-Z_@]\{1,\} *=/p' $$file`; \
 +        if test -n "$$latevars"; then \
 +          echo 'Ensure variables are expanded before rules' >&2; \
 +          echo "Variables are expanded too late in $$file:" >&2; \
 +          echo "$$latevars" | sed 's/^/  /' >&2; \
 +          exit 1; \
 +        fi; \
 +      done
 +
  sc_tests_PATH_SEPARATOR:
        @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
-         echo "Use \`$$PATH_SEPARATOR', not \`:', in PATH definitions above." 1>&2; \
+         echo "Use \`\$$PATH_SEPARATOR', not \`:', in PATH definitions above." 1>&2; \
          exit 1; \
        fi