From f8e0b9be86f848a37c772e504d645901375bd89e Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 28 Feb 2001 09:51:25 +0000 Subject: [PATCH] * Makefile.am (maintainer-check): `undef $/' is OK. --- ChangeLog | 4 ++++ Makefile.am | 6 ++++-- Makefile.in | 4 +++- lib/am/Makefile.am | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b22f9392..e5b90459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-02-28 Akim Demaille + + * Makefile.am (maintainer-check): `undef $/' is OK. + 2001-02-28 Akim Demaille * automake.in (&handle_configure): Fortunately, $top_reldir, diff --git a/Makefile.am b/Makefile.am index eb420ec8..0bfa8284 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,8 +88,10 @@ maintainer-check: automake aclocal echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi -## We never want to use "undef", only "delete". - @if grep -n -w undef $(srcdir)/automake.in; then \ +## We never want to use "undef", only "delete", but for $/. + @if grep -n -w undef $(srcdir)/automake.in | \ + fgrep -v 'undef $/' | \ + grep . ; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi diff --git a/Makefile.in b/Makefile.in index 7629da02..69f71d4f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -621,7 +621,9 @@ maintainer-check: automake aclocal echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi - @if grep -n -w undef $(srcdir)/automake.in; then \ + @if grep -n -w undef $(srcdir)/automake.in | \ + fgrep -v 'undef $/' | \ + grep . ; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index eb420ec8..0bfa8284 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -88,8 +88,10 @@ maintainer-check: automake aclocal echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi -## We never want to use "undef", only "delete". - @if grep -n -w undef $(srcdir)/automake.in; then \ +## We never want to use "undef", only "delete", but for $/. + @if grep -n -w undef $(srcdir)/automake.in | \ + fgrep -v 'undef $/' | \ + grep . ; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi -- 2.43.5