From: Tom Tromey <tromey@redhat.com>
Date: Fri, 9 Feb 2001 07:06:52 +0000 (+0000)
Subject: 	Clean up maintainer-check warnings:
X-Git-Tag: Release-1-4d~9
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c18f4e5022bfe720550a310da975555dbd217793;p=automake.git

	Clean up maintainer-check warnings:
	* Makefile.am (maintainer-check): Ignore comment lines in CDPATH
	check.
	* automake.in (handle_dist_worker): Removed redundant `my $xform'.
---

diff --git a/ChangeLog b/ChangeLog
index 25842fed..21a25c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-09  Tom Tromey  <tromey@redhat.com>
+
+	Clean up maintainer-check warnings:
+	* Makefile.am (maintainer-check): Ignore comment lines in CDPATH
+	check.
+	* automake.in (handle_dist_worker): Removed redundant `my $xform'.
+
 2001-02-09  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&file_contents): Remove a dead branch.
diff --git a/Makefile.am b/Makefile.am
index 80d88e9c..94995391 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,7 +99,7 @@ maintainer-check: automake aclocal
 	  exit 1; \
 	fi
 ## Look for cd within backquotes without CDPATH=:
-	@if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+	@if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
 	      $(srcdir)/m4/*.m4; then \
 	  echo "Consider setting CDPATH in the lines above" 1>&2; \
 	  exit 1; \
diff --git a/Makefile.in b/Makefile.in
index 9756e77e..5eb8fb41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -651,7 +651,7 @@ maintainer-check: automake aclocal
 	  echo "Found bad split in the lines above." 1>&2; \
 	  exit 1; \
 	fi
-	@if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+	@if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
 	      $(srcdir)/m4/*.m4; then \
 	  echo "Consider setting CDPATH in the lines above" 1>&2; \
 	  exit 1; \
diff --git a/automake.in b/automake.in
index 50335755..793b90b7 100755
--- a/automake.in
+++ b/automake.in
@@ -2568,7 +2568,6 @@ sub handle_multilib
 sub handle_dist_worker
 {
     my ($makefile) = @_;
-    my $xform = '';
 
     # Initialization; only at top level.
     my $xform = &transform_cond ('TOPDIR'  => ($relative_dir eq '.'),
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 80d88e9c..94995391 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -99,7 +99,7 @@ maintainer-check: automake aclocal
 	  exit 1; \
 	fi
 ## Look for cd within backquotes without CDPATH=:
-	@if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+	@if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
 	      $(srcdir)/m4/*.m4; then \
 	  echo "Consider setting CDPATH in the lines above" 1>&2; \
 	  exit 1; \