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 25842fed8f11c30b3459df8afa9e2834d156de23..21a25c8625cb1c9c2a29bf12a83e9ff3629d2fb0 100644 (file)
--- 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 80d88e9c3c38c4696775be2cbb049dd9d866f9cf..94995391c1d8d6ba8e1b9a804ce9f069a1d7f5b6 100644 (file)
--- 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 9756e77e7fc33d5d022410729103c4aa2b675461..5eb8fb414856f7925da5c607387fb11e8bf03981 100644 (file)
--- 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 50335755a4cb553e53966cc14b2acf0c9c6cb2a0..793b90b720ffb69b6c7378e5e99438eed87b90db 100755 (executable)
--- 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 80d88e9c3c38c4696775be2cbb049dd9d866f9cf..94995391c1d8d6ba8e1b9a804ce9f069a1d7f5b6 100644 (file)
--- 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; \