Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.0

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.1


scripts/make_binary_distribution.sh:
  Auto merged

scripts/make_binary_distribution.sh

@@ -334,10 +334,7 @@ fi
 if [ $BASE_SYSTEM != "netware" ] ; then
   chmod a+x $BASE/bin/*
   copyfileto $BASE/bin scripts/*
-  $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ \
-      ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ \
-      @HOSTNAME@ \@pkgdatadir\@ ./support-files \
-      < scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
+  copyfileto $BASE/scripts scripts/mysql_install_db
   $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \
       \@sbindir\@ ./bin \@libexecdir\@ ./bin \
       \@MYSQLD_USER\@ @MYSQLD_USER@ \@localstatedir\@ /usr/local/mysql/data \