* automake.in (handle_dist): Introduce new variable to avoid extra

	keys in %dist_dirs.  Fixes distdir.test.

diff --git a/ChangeLog b/ChangeLog
index e3b84fd..e10c026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-21  Tom Tromey  <tromey@redhat.com>
 
+       * automake.in (handle_dist): Introduce new variable to avoid extra
+       keys in %dist_dirs.  Fixes distdir.test.
+
        * automake.in (handle_texinfo): Only remove suffixes we can
        handle.
 

diff --git a/automake.in b/automake.in
index 5cf880e..c3cc8e4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2736,7 +2736,7 @@ sub handle_dist
     if (&variable_defined ('EXTRA_DIST'))
     {
        # FIXME: This should be fixed to work with conditionals.  That
-       # will require only making the entries in @dist_dirs under the
+       # will require only making the entries in %dist_dirs under the
        # appropriate condition.  This is meaningful if the nature of
        # the distribution should depend upon the configure options
        # used.
@@ -2767,10 +2767,10 @@ sub handle_dist
 
     if (scalar keys %dist_dirs)
     {
-       # Prepend $(distdir) to each directory given.  Doing it via a
-       # hash lets us ensure that each directory is used only once.
-       grep ($dist_dirs{'$(distdir)/' . $_} = 1, keys %dist_dirs);
-       $xform .= &transform ('DISTDIRS', join (' ', sort keys %dist_dirs));
+       # Prepend $(distdir) to each directory given.
+       my %rewritten;
+       grep ($rewritten{'$(distdir)/' . $_} = 1, keys %dist_dirs);
+       $xform .= &transform ('DISTDIRS', join (' ', sort keys %rewritten));
     }
     else
     {