* Makefile.am (maintainer-check): Simplify `grep -v ... | grep .'

into `grep -v ...'.

diff --git a/ChangeLog b/ChangeLog
index 3bb6c87f68c5bcd03aa9fad231906d60d9d1c120..f84af7290ef102f249ba78a4a447b2ef8140ec31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-06  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am (maintainer-check): Simplify `grep -v ... | grep .'
+       into `grep -v ...'.
+
 2001-03-06  Pavel Roskin  <proski@gnu.org>
 
        * java.am: Use `rm -f' instead of `rm'.

diff --git a/Makefile.am b/Makefile.am
index 579a641562eedab81b0e3c1da82394ebf8c15600..41fdb6f71222a5a5fe61bb112c25c49b0544539f 100644 (file)
--- 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 9735471c732913432da9ead1c9d67cfcb3307035..73af4852e9d4098fe66d13c012d457019f8dd193 100644 (file)
--- 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 579a641562eedab81b0e3c1da82394ebf8c15600..41fdb6f71222a5a5fe61bb112c25c49b0544539f 100644 (file)
--- 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