diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-10 02:28:24 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-10 02:28:24 +0200 |
| commit | 7870435fa5d1672ba101e251ab1bef5cc2f7fef7 (patch) | |
| tree | d319a4637910da4e4f6daa4f5f8b6dddd71ea5e9 /Build-tools | |
| parent | 4bac1d9f92671b4ed1adc77335e8d2e50cc9de74 (diff) | |
| download | mariadb-git-7870435fa5d1672ba101e251ab1bef5cc2f7fef7.tar.gz | |
Fix for customer build
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-compile | 4 | ||||
| -rwxr-xr-x | Build-tools/mysql-copyright | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index eecd01066e0..fedee8c7774 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -26,7 +26,7 @@ $host=$1 . $opt_suffix; $email="$opt_user\@mysql.com"; $pwd = `pwd`; chomp($pwd); $log="$pwd/Logs/$host$opt_version_suffix.log"; -$opt_distribution =~ /(mysql-[^\/]*)\.tar/; +$opt_distribution =~ /(mysql[^\/]*)\.tar/; $ver=$1; $gcc_version=which("gcc"); if (defined($gcc_version) && ! $opt_config_env) @@ -209,7 +209,7 @@ if ($opt_stage <= 4 && !$opt_no_test) safe_system("gunzip < $tar_file | $tar xf -"); } -$tar_file =~ /(mysql-[^\/]*)\.tar/; +$tar_file =~ /(mysql[^\/]*)\.tar/; $ver=$1; $test_dir="$pwd/$host/test/$ver"; $ENV{"LD_LIBRARY_PATH"}= "$test_dir/lib:" . $ENV{"LD_LIBRARY_PATH"}; diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index df819b20fa1..0d49acac400 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -96,7 +96,7 @@ sub main # remove the 'PUBLIC' file from distribution and copy LICENSE # on the toplevel of the directory instead. file 'PUBLIC' shouldn't # exist in the new mysql distributions, but let's be sure.. - `rm -f $destdir/PUBLIC`; + `rm -f $destdir/PUBLIC $destdir/README`; `cp -p $WD/Docs/LICENSE $destdir/`; # fix file copyrights @@ -129,7 +129,7 @@ sub fix_usage_copyright foreach my $Cfile (@Cfiles) { chop $Cfile; - `replace \"This is free software,\\\\\\nand you are welcome to modify and redistribute it under the GPL license\" \"This is commercial software,\\\\nplease see the file LICENSE for details\" -- $Cfile`; + `replace "This is free software," "This is commercial software," "and you are welcome to modify and redistribute it under the GPL license" "please see the file LICENSE for details" -- $Cfile`; } } |