From 3659edf33d449c03e5e85ee7c90ef18d44867618 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Feb 2001 02:58:50 +0000 Subject: [PATCH] * automake.in (handle_dist): Introduce new variable to avoid extra keys in %dist_dirs. Fixes distdir.test. --- ChangeLog | 3 +++ automake.in | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3b84fd7..e10c0262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-21 Tom Tromey + * 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 5cf880ef..c3cc8e43 100755 --- 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 { -- 2.43.5