Commit 4ba6a73d authored by mwagner@here.mwagner.org's avatar mwagner@here.mwagner.org

Merge here.mwagner.org:/Volumes/BK/mysql-4.1

into here.mwagner.org:/Volumes/BK/mysql-4.1-work
parents 0935a093 35b512f0
...@@ -162,7 +162,23 @@ sub trim_the_fat ...@@ -162,7 +162,23 @@ sub trim_the_fat
undef $/; undef $/;
my $configure= <CONFIGURE>; my $configure= <CONFIGURE>;
close(CONFIGURE); close(CONFIGURE);
$configure=~ s|${the_fat}/Makefile dnl\n?||g;
#
# If $the_fat Makefile line closes the parenthesis, then
# replace that line with just the closing parenthesis.
#
if ($configure=~ m|${the_fat}/Makefile\)\n?|)
{
$configure=~ s|${the_fat}/Makefile(\)\n?)|$1|;
}
#
# Else just delete the line
#
else
{
$configure=~ s|${the_fat}/Makefile dnl\n?||;
}
open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n"; open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n";
print CONFIGURE $configure; print CONFIGURE $configure;
close(CONFIGURE); close(CONFIGURE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment