diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:23:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:23:44 +0300 |
| commit | 7a3636c1af6fb82eaad236f85196b5a5bd03c705 (patch) | |
| tree | 7cfdb826dde4f4515f7f806908ac679e40e7140b /scripts | |
| parent | ee2b93944b2f7267690f29639da7e881f39379fa (diff) | |
| parent | d7a4672cf7a42e9676659292535fc5b4ef3b6af7 (diff) | |
| download | mariadb-git-7a3636c1af6fb82eaad236f85196b5a5bd03c705.tar.gz | |
Merge from mysql-5.1-bugteam.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 951699317fd..455bc93e642 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scripts/ # 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 diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index aa106a3dfc4..3174d61792a 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -183,8 +183,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 # ---------------------------------------------------------------------- |