* automake.in (&handle_dist): Use &transform instead of dedicated

magic for DISTDIRS.
But be sure to always do it.
* distdir.am: Adjust.

diff --git a/ChangeLog b/ChangeLog
index 2ebff2e17576085c897f6e1aee331dc691dc0135..d4be9cbe523646e85527c73883c8d986322267de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * automake.in: Use File::Basename.

diff --git a/automake.in b/automake.in
index 2b1859d38e47077a9520307aa77ac23fb997df3d..2f1f90825875b5b2edc268a2ee5c921d9930d614 100755 (executable)
--- 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 6df3cd49ab582230901302ba1a51468844490b9d..e566674e30e2ecd862de6bff503ab80066e4540b 100644 (file)
--- 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 6df3cd49ab582230901302ba1a51468844490b9d..e566674e30e2ecd862de6bff503ab80066e4540b 100644 (file)
--- 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 \