summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se>2006-11-07 22:55:19 +0100
committerunknown <kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se>2006-11-07 22:55:19 +0100
commit11eb31a3c5f09323da0209951eb40a44edb30ec0 (patch)
tree96a9f77e1e46a06b01469900810fa2996bc52a2d /scripts
parent024a1781a6310383c1e352d483e7a701d564d051 (diff)
parentd167b60f6349fb48556d05564f1153396e4cecf7 (diff)
downloadmariadb-git-11eb31a3c5f09323da0209951eb40a44edb30ec0.tar.gz
Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
into mysql.com:/Users/kent/mysql/bk/lic/my50-lic scripts/make_binary_distribution.sh: Auto merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index d9e3ea27895..512e8a574ed 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -121,7 +121,7 @@ copyfileto()
copyfileto $BASE/docs ChangeLog Docs/mysql.info
copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
- EXCEPTIONS-CLIENT MySQLEULA.txt LICENSE.doc README.NW
+ EXCEPTIONS-CLIENT LICENSE.mysql
# Non platform-specific bin dir files:
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
@@ -303,10 +303,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
$BASE/support-files/build-tags \
$BASE/support-files/MySQL-shared-compat.spec \
$BASE/support-files/ndb-config-2-node.ini \
- $BASE/INSTALL-BINARY \
- $BASE/MySQLEULA.txt
-else
- rm -f $BASE/README.NW
+ $BASE/INSTALL-BINARY
fi
# Make safe_mysqld a symlink to mysqld_safe for backwards portability