* Makefile.am (maintainer-check): Allow `automake:' tokens,

occuring in location.test.  Automake now has 5 legitimate
unsubstituted @strings@.

diff --git a/ChangeLog b/ChangeLog
index fa2af631c978476aa425ed985e82b53ed35ce36d..1e19cf1e29062475d26cca882bb682fa7b31ac62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-03-19  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * Makefile.am (maintainer-check): Allow `automake:' tokens,
+       occuring in location.test.  Automake now has 5 legitimate
+       unsubstituted @strings@.
+
        * tests/aclocal4.test: Require GNU make.
 
 2003-03-14  Alexandre Duret-Lutz  <adl@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index 8112993cd764fdbae3d58358218033dff74596b4..4fcd05e581bdc0f3fa1b4261f402ddae0578b05d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,7 +196,7 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
 ## Tests should never call automake directly.
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*automake'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   ]*automake([^:]|$$)'; then \
          echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" instead.' 1>&2;  \
          exit 1; \
        fi
@@ -251,8 +251,8 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
 ## In automake there are a few valid ones.
-       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 4; then \
-         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 5; then \
+         echo "Unresolved @...@ substitution in automake" 1>&2; \
          exit 1; \
        fi
 

diff --git a/Makefile.in b/Makefile.in
index da138eb9911a1229de0fa7aa9d569a8ff8e84d3e..f9980ac00c22e02a7e2e39d6088efacde52a1039 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -795,7 +795,7 @@ maintainer-check: automake aclocal
          echo 'Do not run "autoupdate" in the above tests.  Use "$$AUTOUPDATE" instead.' 1>&2; \
          exit 1; \
        fi
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*automake'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   ]*automake([^:]|$$)'; then \
          echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" instead.' 1>&2;  \
          exit 1; \
        fi
@@ -838,8 +838,8 @@ maintainer-check: automake aclocal
          echo "Unresolved @...@ substitution in aclocal" 1>&2; \
          exit 1; \
        fi
-       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 4; then \
-         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 5; then \
+         echo "Unresolved @...@ substitution in automake" 1>&2; \
          exit 1; \
        fi