From dd177ff8ddbc4bce58f2505918b74070a54cabdd Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 6 Mar 2001 18:24:59 +0000 Subject: [PATCH] * Makefile.am (maintainer-check): Simplify `grep -v ... | grep .' into `grep -v ...'. --- ChangeLog | 5 +++++ Makefile.am | 9 +++------ Makefile.in | 9 +++------ lib/am/Makefile.am | 9 +++------ 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bb6c87f..f84af729 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-06 Akim Demaille + + * Makefile.am (maintainer-check): Simplify `grep -v ... | grep .' + into `grep -v ...'. + 2001-03-06 Pavel Roskin * java.am: Use `rm -f' instead of `rm'. diff --git a/Makefile.am b/Makefile.am index 579a6415..41fdb6f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,22 +75,19 @@ maintainer-check: automake aclocal ## is a shell construct, not a Makefile construct. ## The backslash in `$${' is needed for some versions of bash. @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$$$' | \ - grep . ; then \ + fgrep -v '$$$$'; then \ echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi ## Make sure all invocations of mkinstalldirs are correct. @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$(mkinstalldirs)' | \ - grep . ; then \ + fgrep -v '$$(mkinstalldirs)'; then \ echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi ## We never want to use "undef", only "delete", but for $/. @if grep -n -w undef $(srcdir)/automake.in | \ - fgrep -v 'undef $$/' | \ - grep . ; then \ + fgrep -v 'undef $$/'; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi diff --git a/Makefile.in b/Makefile.in index 9735471c..73af4852 100644 --- a/Makefile.in +++ b/Makefile.in @@ -623,20 +623,17 @@ maintainer-check: automake aclocal $(PERL) -c -w automake $(PERL) -c -w aclocal @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$$$' | \ - grep . ; then \ + fgrep -v '$$$$'; then \ echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$(mkinstalldirs)' | \ - grep . ; then \ + fgrep -v '$$(mkinstalldirs)'; then \ echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi @if grep -n -w undef $(srcdir)/automake.in | \ - fgrep -v 'undef $$/' | \ - grep . ; then \ + fgrep -v 'undef $$/'; 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 579a6415..41fdb6f7 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -75,22 +75,19 @@ maintainer-check: automake aclocal ## is a shell construct, not a Makefile construct. ## The backslash in `$${' is needed for some versions of bash. @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$$$' | \ - grep . ; then \ + fgrep -v '$$$$'; then \ echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi ## Make sure all invocations of mkinstalldirs are correct. @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ - fgrep -v '$$(mkinstalldirs)' | \ - grep . ; then \ + fgrep -v '$$(mkinstalldirs)'; then \ echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi ## We never want to use "undef", only "delete", but for $/. @if grep -n -w undef $(srcdir)/automake.in | \ - fgrep -v 'undef $$/' | \ - grep . ; then \ + fgrep -v 'undef $$/'; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi -- 2.43.5