diff options
author | unknown <mwagner@here.mwagner.org> | 2004-06-30 23:31:33 -0500 |
---|---|---|
committer | unknown <mwagner@here.mwagner.org> | 2004-06-30 23:31:33 -0500 |
commit | 94fffe417f2e1793fb9bb05cfc189ed868a0c4b4 (patch) | |
tree | ab2c378a570e2e96fc2101567e729b5474681e5a /Build-tools | |
parent | 71094f111550f5181dd10157763151746146723f (diff) | |
parent | 71e46dc9a0fcf12ab6c3780afb32ca889524db8b (diff) | |
download | mariadb-git-94fffe417f2e1793fb9bb05cfc189ed868a0c4b4.tar.gz |
Merge here.mwagner.org:/Volumes/BK/mysql-4.1
into here.mwagner.org:/Volumes/BK/mysql-4.1-work
Diffstat (limited to 'Build-tools')
-rwxr-xr-x | Build-tools/mysql-copyright | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index f2da3cdf447..e1ee513e06d 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -162,7 +162,23 @@ sub trim_the_fat undef $/; my $configure= <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"; print CONFIGURE $configure; close(CONFIGURE); |