]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Avoid false positive in sc_tests_plain_make maintainer-check.
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Thu, 16 Dec 2010 18:58:21 +0000 (19:58 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Thu, 16 Dec 2010 18:58:21 +0000 (19:58 +0100)
* Makefile.am (sc_tests_plain_make): Ensure to only match full
`make' words.  Avoid false positive with remake11.test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
ChangeLog
Makefile.am
Makefile.in

index d605b228d58106937fab1357f132136d9b647628..7b73d0a313115eb9bcf10dd3f4d314e87cc270ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Avoid false positive in sc_tests_plain_make maintainer-check.
+       * Makefile.am (sc_tests_plain_make): Ensure to only match full
+       `make' words.  Avoid false positive with remake11.test.
+
 2010-12-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Tests: extend checks on remake rules.
index d19d974be146d7655c6d6d4ad1f966828b401d49..8aed8d06f532a9bdaef759c4f59269a2eab23e0c 100644 (file)
@@ -287,7 +287,7 @@ sc_tests_make_without_am_makeflags:
 
 ## Tests should never call make directly.
 sc_tests_plain_make:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*make'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; then \
          echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 1>&2; \
          exit 1; \
        fi
index 241f9743ece25a09a625bbac223a0f240ffee412..9b6c6d19d1047a32673e0018b5b76ec570300243 100644 (file)
@@ -993,7 +993,7 @@ sc_tests_make_without_am_makeflags:
        fi
 
 sc_tests_plain_make:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*make'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; then \
          echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 1>&2; \
          exit 1; \
        fi