From: Akim Demaille <akim@epita.fr>
Date: Wed, 28 Feb 2001 09:51:25 +0000 (+0000)
Subject: * Makefile.am (maintainer-check): `undef $/' is OK.
X-Git-Tag: handle-languages~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8df62374836bca3caea03a40844436a0ecc96b3b;p=thirdparty%2Fautomake.git

* Makefile.am (maintainer-check): `undef $/' is OK.
---

diff --git a/ChangeLog b/ChangeLog
index b22f9392e..e5b904596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-28  Akim Demaille  <akim@epita.fr>
+
+	* Makefile.am (maintainer-check): `undef $/' is OK.
+
 2001-02-28  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&handle_configure): Fortunately, $top_reldir,
diff --git a/Makefile.am b/Makefile.am
index eb420ec89..0bfa82845 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 7629da02c..69f71d4fc 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 eb420ec89..0bfa82845 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