summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-04-07 20:30:26 +0200
committerunknown <joerg@trift2.>2007-04-07 20:30:26 +0200
commitb77c664ea82bbd3286a750344e2dac5772d5423b (patch)
tree27661120780424c1828d0aea6a7bc8b647932a1a /scripts
parentbe3bc128abb09641f0d03216101c4d6938af4245 (diff)
parentfb27844b0ff745503b6d877ae1a5b004e709c89d (diff)
downloadmariadb-git-b77c664ea82bbd3286a750344e2dac5772d5423b.tar.gz
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1 BitKeeper/etc/ignore: auto-union
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index eab3af29ad1..013084475b1 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -117,7 +117,12 @@ if [ $BASE_SYSTEM != "netware" ] ; then
chmod o-rwx $BASE/data $BASE/data/*
fi
-# Copy files if they exists, warn for those that don't
+# Copy files if they exists, warn for those that don't.
+# Note that when listing files to copy, we might list the file name
+# twice, once in the directory location where it is build, and a
+# second time in the ".libs" location. In the case the firs one
+# is a wrapper script, the second one will overwrite it with the
+# binary file.
copyfileto()
{
destdir=$1
@@ -168,6 +173,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
# For all other platforms:
else
BIN_FILES="$BIN_FILES \
+ server-tools/instance-manager/.libs/mysqlmanager \
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
client/.libs/mysqlslap \
client/.libs/mysqldump client/.libs/mysqlimport \