* automake.in ($am_file): Be `local', as my'd variables used in

`foreach' loops are always private to the loop.

diff --git a/ChangeLog b/ChangeLog
index 1af121287f392915642eac30aaa2dd63a7dc0607..65461e2d3401c2c6943002bb97dc46d6890bc716 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+       * automake.in ($am_file): Be `local', as my'd variables used in
+       `foreach' loops are always private to the loop.
+
 2001-02-26  Pavel Roskin  <proski@gnu.org>
 
        * Makefile.am: Add install.am.

diff --git a/Makefile.am b/Makefile.am
index 42cb2d217220de2c0a98afdea0830d20e71e0b86..eb420ec892702bf267f0402bc2a733133f4416a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,15 +117,15 @@ maintainer-check: automake aclocal
 ## Up to now we manage to limit to 6 uses of local.
        @locals=`grep -c '^[ \t]*local [^*]' $(srcdir)/automake.in`; \
        case $$locals in \
-         [0-5] ) \
+         [0-6] ) \
            echo "Wow, congrats!  There are $$locals \`local' now!." >&2; \
            echo "Please update Makefile.am (maintainer-check)." >&2; \
            exit 1; \
          ;; \
-         6 ) ;; \
+         7 ) ;; \
          * ) \
            echo "Too many \`local'!  Are you sure you need $$locals of them?" >&2; \
-           echo "Up to now 6 was enough." >&2; \
+           echo "Up to now 7 was enough." >&2; \
            exit 1; \
          ;; \
        esac

diff --git a/Makefile.in b/Makefile.in
index fc3173e82f0fcb7bff9dbd8c3323c77a7655c700..6a7d31b95c2452de47bfd2e68231e6e7d4e5c6f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -643,15 +643,15 @@ maintainer-check: automake aclocal
        fi
        @locals=`grep -c '^[ \t]*local [^*]' $(srcdir)/automake.in`; \
        case $$locals in \
-         [0-5] ) \
+         [0-6] ) \
            echo "Wow, congrats!  There are $$locals \`local' now!." >&2; \
            echo "Please update Makefile.am (maintainer-check)." >&2; \
            exit 1; \
          ;; \
-         6 ) ;; \
+         7 ) ;; \
          * ) \
            echo "Too many \`local'!  Are you sure you need $$locals of them?" >&2; \
-           echo "Up to now 6 was enough." >&2; \
+           echo "Up to now 7 was enough." >&2; \
            exit 1; \
          ;; \
        esac

diff --git a/automake.in b/automake.in
index 1bb1f705dfac3f0a6ba898334bc353d7da2e0039..d45941855560206cb27e15b8673fc95b3c58ea94 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -419,7 +419,9 @@ die "$me: no \`Makefile.am' found or specified\n"
     if ! @input_files;
 
 # Now do all the work on each file.
-foreach my $am_file (@input_files)
+# This guy must be local otherwise it's private to the loop.
+local $am_file;
+foreach $am_file (@input_files)
 {
     if (! -f ($am_file . '.am'))
     {

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 42cb2d217220de2c0a98afdea0830d20e71e0b86..eb420ec892702bf267f0402bc2a733133f4416a5 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -117,15 +117,15 @@ maintainer-check: automake aclocal
 ## Up to now we manage to limit to 6 uses of local.
        @locals=`grep -c '^[ \t]*local [^*]' $(srcdir)/automake.in`; \
        case $$locals in \
-         [0-5] ) \
+         [0-6] ) \
            echo "Wow, congrats!  There are $$locals \`local' now!." >&2; \
            echo "Please update Makefile.am (maintainer-check)." >&2; \
            exit 1; \
          ;; \
-         6 ) ;; \
+         7 ) ;; \
          * ) \
            echo "Too many \`local'!  Are you sure you need $$locals of them?" >&2; \
-           echo "Up to now 6 was enough." >&2; \
+           echo "Up to now 7 was enough." >&2; \
            exit 1; \
          ;; \
        esac