[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
57-fix-transform.patch
From: |
Akim Demaille |
Subject: |
57-fix-transform.patch |
Date: |
Mon, 19 Mar 2001 10:21:28 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&transform): Fix an incredible bug which was
breaking the if/endif system.
($ELSE_PATTERN): Admit an optional argument.
Index: automake.in
--- automake.in Sun, 11 Mar 2001 21:03:14 +0100 akim (am/f/39_automake.i 1.176
755)
+++ automake.in Sun, 11 Mar 2001 21:26:56 +0100 akim (am/f/39_automake.i 1.176
755)
@@ -60,7 +60,7 @@
my $BOGUS_MACRO_PATTERN = "^ *([^ \t]*)[ \t]*([:+]?)=[ \t]*(.*)\$";
my $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
my $IF_PATTERN = "^if[ \t]+([A-Za-z][A-Za-z0-9_]*)[ \t]*(#.*)?\$";
-my $ELSE_PATTERN = "^else[ \t]*(#.*)?\$";
+my $ELSE_PATTERN = "^else(?:[ \t]+([A-Za-z][A-Za-z0-9_]*))?[ \t]*(#.*)?\$";
my $ENDIF_PATTERN = "^endif(?:[ \t]+([A-Za-z][A-Za-z0-9_]*))?[ \t]*(#.*)?\$";
my $PATH_PATTERN='(\\w|[/.-])+';
# This will pass through anything not of the prescribed form.
@@ -6954,12 +6935,12 @@ sub transform (%)
if ($val)
{
$result .= "s/\Q?$token?\E//gm;s/^.*\Q?!$token?\E.*\\n//gm;";
- $result .=
"s/\Q%?$token%\E/TRUE/gm;s/^.*\Q%!$token%\E.*\\n/FALSE/gm;";
+ $result .= "s/\Q%?$token%\E/TRUE/gm;s/\Q%!$token%\E/FALSE/gm;";
}
else
{
$result .= "s/\Q?!$token?\E//gm;s/^.*\Q?$token?\E.*\\n//gm;";
- $result .=
"s/\Q%?$token%\E/FALSE/gm;s/^.*\Q%!$token%\E.*\\n/TRUE/gm;";
+ $result .= "s/\Q%?$token%\E/FALSE/gm;s/\Q%!$token%\E/TRUE/gm;";
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 57-fix-transform.patch,
Akim Demaille <=