Fix for customer build

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"};

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`;
   }
 }
 

sql/mysqld.cc

@@ -3183,10 +3183,11 @@ static void use_help(void)
 static void usage(void)
 {
   print_version();
-  puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB, by Monty and others");
-  puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,");
-  puts("and you are welcome to modify and redistribute it under the GPL license\n");
-  puts("Starts the MySQL server\n");
+  puts("\
+Copyright (C) 2000 MySQL AB, by Monty and others\n\
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
+and you are welcome to modify and redistribute it under the GPL license\n\
+Starts the MySQL server\n");
 
   printf("Usage: %s [OPTIONS]\n", my_progname);
   puts("\n\