diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:07:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:07:37 +0300 |
| commit | d7a4672cf7a42e9676659292535fc5b4ef3b6af7 (patch) | |
| tree | b3d7ab3039d01aac8146c576686d294ed5b761bf /scripts | |
| parent | 7704e3c2c200d479ced1c943efb9cf9575493091 (diff) | |
| parent | 174a6962dafe030759fd27dc8404f2c972e589e6 (diff) | |
| download | mariadb-git-d7a4672cf7a42e9676659292535fc5b4ef3b6af7.tar.gz | |
Merge from mysql-5.0-bugteam.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 6 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 79ad585b7d5..bcad5e2ad8c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -302,8 +302,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then # Copy readme and license files cp README Docs/INSTALL-BINARY $DEST/ - if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then - cp COPYING EXCEPTIONS-CLIENT $DEST/ + if [ -f COPYING ] ; then + cp COPYING $DEST/ elif [ -f LICENSE.mysql ] ; then cp LICENSE.mysql $DEST/ else @@ -381,7 +381,7 @@ copyfileto() copyfileto $BASE/docs ChangeLog Docs/mysql.info copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - EXCEPTIONS-CLIENT LICENSE.mysql + LICENSE.mysql # Non platform-specific bin dir files: BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 22970c95ddd..ac500dded8f 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -187,8 +187,8 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true cp support-files/my-*.ini $DESTDIR/ if [ -f COPYING ] ; then - cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ - cp COPYING $DESTDIR/Docs/ + cp COPYING $DESTDIR/ + cp COPYING $DESTDIR/Docs/ fi # ---------------------------------------------------------------------- |