Re: aclocal/dirlist

Hello,

On Mon, Oct 17, 2005 at 01:55:45PM +0200, Stefan Fiedler wrote:
> Am Monday 17 October 2005 10:27 schrieb Stepan Kasal:
> > Thank you again for all your work on this.
> No problem,

well, Clifford invented another approach, ...

> https://www.rocklinux.net/submaster/smadm.cgi?i=2005101713421324232

... so I think you can discard this patch.

Instead, we have to add three patches, for 1.7.9, 1.8.5, and 1.9.6.

The patch for 1.7.9 is attached, untested.
The other two will be the same, but it seems the indentation has changed.

Stefan, are you willing to finish this and submit it to sm?

Thanks again,
	Stepan

_______________________________________________
rock-devel mailing list
[email protected]
http://www.rocklinux.net/mailman/listinfo/rock-devel

--- automake-1.7.9.orig/aclocal.in	2003-10-21 15:03:16.000000000 +0200
+++ automake-1.7.9/aclocal.in	2005-10-18 18:00:01.000000000 +0200
@@ -208,12 +208,11 @@
 	    # Ignore '#' lines.
 	    next if /^#/;
 	    # strip off newlines and end-of-line comments
-	    s/\s*\#.*$//;
-	    chomp ($contents=$_);
-	    if (-d $contents )
-	    {
-		push (@dirlist, $contents);
-	    }
+	    s/\s*\#.*$//; chomp;
+	    foreach my $dir (glob)
+	      {
+		push (@dirlist, $dir) if -d $dir;
+	      }
 	}
 	close (DEFAULT_DIRLIST);
     }