From 13d1b1562eb88f9ed95e47a2230042a32e9e6f0a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 26 Feb 2001 09:54:23 +0000 Subject: [PATCH] * automake.in (&handle_dist): Use &transform instead of dedicated magic for DISTDIRS. But be sure to always do it. * distdir.am: Adjust. --- ChangeLog | 8 ++++++++ automake.in | 15 ++++----------- distdir.am | 2 +- lib/am/distdir.am | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ebff2e1..d4be9cbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-02-26 Akim Demaille + + * automake.in (&handle_dist): Use &transform instead of dedicated + magic for DISTDIRS. + But be sure to always do it. + * distdir.am: Adjust. + + 2001-02-26 Akim Demaille * automake.in: Use File::Basename. diff --git a/automake.in b/automake.in index 2b1859d3..2f1f9082 100755 --- a/automake.in +++ b/automake.in @@ -2649,17 +2649,10 @@ sub handle_dist 'DISTCHECK-HOOK' => &target_defined ('distcheck-hook'), 'GETTEXT' => $seen_gettext); - if (scalar 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 - { - $xform .= 's/.*\@DISTDIRS\@.*//g;'; - } + # Prepend $(distdir) to each directory given. + my %rewritten; + grep ($rewritten{'$(distdir)/' . $_} = 1, keys %dist_dirs); + $xform .= &transform ('DISTDIRS', join (' ', sort keys %rewritten)); # If we have SUBDIRS, create all dist subdirectories and do # recursive build. diff --git a/distdir.am b/distdir.am index 6df3cd49..e566674e 100644 --- a/distdir.am +++ b/distdir.am @@ -43,7 +43,7 @@ distdir: $(DISTFILES) ?TOPDIR? mkdir $(distdir) ## ## - $(mkinstalldirs) @DISTDIRS@ +?DISTDIRS? $(mkinstalldirs) @DISTDIRS@ ## ## @for file in $(DISTFILES); do \ diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 6df3cd49..e566674e 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -43,7 +43,7 @@ distdir: $(DISTFILES) ?TOPDIR? mkdir $(distdir) ## ## - $(mkinstalldirs) @DISTDIRS@ +?DISTDIRS? $(mkinstalldirs) @DISTDIRS@ ## ## @for file in $(DISTFILES); do \ -- 2.43.5