[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Automake includes bug

From: Bob Friesenhahn
Subject: Re: Automake includes bug
Date: Mon, 30 Aug 2004 09:12:10 -0500 (CDT)


The patch works great!


On Mon, 30 Aug 2004, Andreas Schwab wrote:

Bob Friesenhahn <address@hidden> writes:

Using Automake 1.9.1 & Perl 5.8.4 there is a bug with file inclusion.

Out of the lines:

include $(srcdir)/config/Makefile.ami
include $(srcdir)/ltdl/Makefile.ami
include $(srcdir)/magick/Makefile.ami
include $(srcdir)/coders/Makefile.ami
include $(srcdir)/filters/Makefile.ami
include $(srcdir)/Magick++/Makefile.ami
include $(srcdir)/wand/Makefile.ami
include $(srcdir)/utilities/Makefile.ami

all of the inclusions work correctly except for the line

include $(srcdir)/Magick++/Makefile.ami

which is transposed directly into the file without otherwise
being processed by Automake.

Is there a fix or workaround for this other than altering the source tree
or moving the file?

Here is a patch:

2004-08-30  Andreas Schwab  <address@hidden>

        * ($PATH_PATTERN): Add `+'.

RCS file: /cvs/automake/automake/,v
retrieving revision 1.1577
diff -u -p -a -u -p -a -r1.1577
--- 8 Aug 2004 19:05:13 -0000       1.1577
+++ 30 Aug 2004 08:39:04 -0000
@@ -187,7 +187,7 @@ my $ELSE_PATTERN =
  '^else(?:\s+(!?)\s*([A-Za-z][A-Za-z0-9_]*))?\s*(?:#.*)?' . "\$";
  '^endif(?:\s+(!?)\s*([A-Za-z][A-Za-z0-9_]*))?\s*(?:#.*)?' . "\$";
-my $PATH_PATTERN = '(\w|[/.-])+';
+my $PATH_PATTERN = '(\w|[+/.-])+';
# This will pass through anything not of the prescribed form.
my $INCLUDE_PATTERN = ('^include\s+'
                       . '((\$\(top_srcdir\)/' . $PATH_PATTERN . ')'


Andreas Schwab, SuSE Labs, address@hidden
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Bob Friesenhahn

reply via email to

[Prev in Thread] Current Thread [Next in Thread]