summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-02-20 17:53:22 +0100
committerunknown <lenz@mysql.com>2004-02-20 17:53:22 +0100
commitf0a68c5c73e6b682ac60a8d32e63cc7f9636dc88 (patch)
treef7543613347a7133871ffa0da7d06bca4e974401
parent9977ce0c718de3ffc9eeb2445d3eb5fc2ef899cc (diff)
parentbd5930ccb247ab988def837c0fee79b333ead8e7 (diff)
downloadmariadb-git-f0a68c5c73e6b682ac60a8d32e63cc7f9636dc88.tar.gz
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
-rwxr-xr-xBuild-tools/mysql-copyright8
1 files changed, 6 insertions, 2 deletions
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright
index a798ee7ab65..004476ff92c 100755
--- a/Build-tools/mysql-copyright
+++ b/Build-tools/mysql-copyright
@@ -101,8 +101,12 @@ sub main
unlink("$destdir/PUBLIC", "$destdir/README");
copy("$WD/Docs/MySQLEULA.txt", "$destdir");
- # remove readline subdir
- `rm -rf $destdir/cmd-line-utils/readline`;
+ # remove readline subdir and update configure accordingly
+ system("rm -rf $destdir/cmd-line-utils/readline");
+ unlink ("$destdir/configure") or die "Can't delete $destdir/configure: $!\n";
+ `(cd $destdir ; sed -e 's!\ cmd-line-utils\/readline\/Makefile\ dnl!!g' < configure.in > configure.in.new)`;
+ rename ("$destdir/configure.in.new","$destdir/configure.in") or die "Can't rename $destdir/configure.in.new: $!\n";;
+ `(cd $destdir ; autoconf)`;
# fix file copyrights
&fix_usage_copyright();