diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 12:53:39 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 12:53:39 +0300 |
| commit | 85f855e0ed38b73839943a83b2cccb1c46ba6fd9 (patch) | |
| tree | a65f42649a6658936972895da00a6b7b777a2984 /scripts | |
| parent | e9cb14694ef9b4682114b91f76c179aad17bb598 (diff) | |
| download | mariadb-git-85f855e0ed38b73839943a83b2cccb1c46ba6fd9.tar.gz | |
A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
EXCEPTIONS-CLIENT from all the places.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 | ||||
| -rw-r--r-- | scripts/make_win_src_distribution_old.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index a089e8ef55d..93a78037843 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -211,7 +211,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 9e3fc010885..34134ccd977 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -200,8 +200,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 # ---------------------------------------------------------------------- diff --git a/scripts/make_win_src_distribution_old.sh b/scripts/make_win_src_distribution_old.sh index dfb43585a21..f319bad6d55 100644 --- a/scripts/make_win_src_distribution_old.sh +++ b/scripts/make_win_src_distribution_old.sh @@ -312,7 +312,7 @@ touch $BASE/innobase/ib_config.h # cd $SOURCE -for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\ +for i in COPYING ChangeLog README \ INSTALL-SOURCE INSTALL-WIN \ INSTALL-WIN-SOURCE \ Docs/INSTALL-BINARY Docs/manual.chm @@ -376,7 +376,7 @@ fi # Search the tree for plain text files and adapt the line end marker # find $BASE \( -name "*.cnf" -o -name "*.ini" \ - -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ + -o -name COPYING -o -name ChangeLog \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ -o -name "*.dsp" -o -name "*.dsw" \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \ |