summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-23 02:48:52 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-23 02:48:52 +0300
commitb6a4515785caed80805d00b2d77e5fa197aa9476 (patch)
tree576302ffedeaa77cae39a3f3d50ab786b9dcddad /scripts
parent0833663fff0d01fe26e997abdd681bd0d512cd11 (diff)
downloadmariadb-git-b6a4515785caed80805d00b2d77e5fa197aa9476.tar.gz
Portabilityfix in mysqladmin.c
Fix when using --localstatedir Cleaned up mysql.server Build-tools/Do-compile: Remove test file timestamp2 Docs/manual.texi: Changelog client/mysqladmin.c: Portability fix scripts/make_binary_distribution.sh: Fix for mysql.server sql/mysqld.cc: Fix when using --localstatedir support-files/mysql.server.sh: More comments for usage of 'basedir'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 6e66a0b977c..2617a7971dc 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -120,7 +120,7 @@ $CP scripts/* $BASE/bin
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
-$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
+$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
# Make safe_mysqld a symlink to mysqld_safe for backwards portability
@@ -128,7 +128,7 @@ $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
(cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
mv $BASE/support-files/binary-configure $BASE/configure
-chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/configure
+chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure
$CP -r sql-bench/* $BASE/sql-bench
rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la