From 1c09219161fe59f873ee8455a72e63adfecfcb04 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 19 Mar 2003 21:14:56 +0000 Subject: [PATCH] * Makefile.am (maintainer-check): Allow `automake:' tokens, occuring in location.test. Automake now has 5 legitimate unsubstituted @strings@. --- ChangeLog | 4 ++++ Makefile.am | 6 +++--- Makefile.in | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa2af631c..1e19cf1e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-03-19 Alexandre Duret-Lutz + * 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 diff --git a/Makefile.am b/Makefile.am index 8112993cd..4fcd05e58 100644 --- 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 da138eb99..f9980ac00 100644 --- 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 -- 2.47.2