[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-765-g25917d6

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=25917d6ba3350de974f432498fa82febb10e9e11

The branch, master has been updated
       via  25917d6ba3350de974f432498fa82febb10e9e11 (commit)
       via  82a10984a75107c2b06f71e69c482bbb0c62f84b (commit)
       via  99847a1220b6f3212e73dca10448297f1fc15f3e (commit)
      from  fb8570413625c417aef963f9ecf6af4bfbc846f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25917d6ba3350de974f432498fa82febb10e9e11
Merge: fb85704 82a1098
Author: Stefano Lattarini <address@hidden>
Date:   Fri Apr 15 20:09:54 2011 +0200

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    7 +++++++
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 977e08c..1464f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-04-14  Stefano Lattarini  <address@hidden>
 
+       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  <address@hidden>
+
        tests: fix typo in python5b.test
        * tests/python5b.test: Remove extra `:' from $PATH redefinition.
 
diff --git a/Makefile.am b/Makefile.am
index cf4e0d0..7ee282b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -566,7 +566,7 @@ sc_tests_makefile_variable_order: 
sc_ensure_testsuite_has_run
 ## Using `:' as a PATH separator is not portable.
 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
 
diff --git a/Makefile.in b/Makefile.in
index e2f796f..9b976a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1280,7 +1280,7 @@ sc_tests_makefile_variable_order: 
sc_ensure_testsuite_has_run
 
 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
 


hooks/post-receive
-- 
GNU Automake