76-magicless-distdirs.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&handle_dist): Use &transform instead of dedicated
        magic for DISTDIRS.
        But be sure to always do it.
        * distdir.am: Adjust.
        
        
Index: automake.in
--- automake.in Sun, 25 Feb 2001 22:11:59 +0100 akim (am/f/39_automake.i 1.82 
755)
+++ automake.in Sun, 25 Feb 2001 22:13:46 +0100 akim (am/f/39_automake.i 1.82 
755)
@@ -2612,17 +2612,10 @@ sub handle_dist
                       'DISTCHECK-HOOK' => &target_defined ('distcheck-hook'),
                       'GETTEXT'        => $seen_gettext);
 
-    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));
-    }
-    else
-    {
-        $xform .= 's/address@hidden@.*//g;';
-    }
+    # 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));
 
     # If we have SUBDIRS, create all dist subdirectories and do
     # recursive build.
Index: distdir.am
--- distdir.am Mon, 19 Feb 2001 02:58:32 +0100 akim (am/h/17_distdir.am 1.9 644)
+++ distdir.am Sun, 25 Feb 2001 22:12:58 +0100 akim (am/h/17_distdir.am 1.9 644)
@@ -43,7 +43,7 @@
 ?TOPDIR?       mkdir $(distdir)
 ##
 ##
-       $(mkinstalldirs) @DISTDIRS@
+?DISTDIRS?     $(mkinstalldirs) @DISTDIRS@
 ##
 ##
        @for file in $(DISTFILES); do \