diff options
| author | unknown <lenz@mysql.com> | 2004-08-05 01:54:04 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-08-05 01:54:04 +0200 |
| commit | d62dff227d8d9c3358a31ecf99cf095fb129d864 (patch) | |
| tree | 31c74b5bf320b1e071239c7949bf6f30bee8e600 | |
| parent | f618dd6a258cafb76a22f394c88906d85cc3ee35 (diff) | |
| download | mariadb-git-d62dff227d8d9c3358a31ecf99cf095fb129d864.tar.gz | |
- applied the required changes to create the FOSS License exception
file "EXCEPTIONS" and include it in the source and binary
distributions
Build-tools/mysql-copyright:
- remove COPYING and EXCEPTIONS from the commercial packages
Docs/Makefile.am:
- create the EXCEPTIONS file that includes the FOSS License exception
scripts/make_binary_distribution.sh:
- include EXCEPTIONS in the binary distribution, too.
support-files/mysql.spec.sh:
- add EXCEPTIONS to the server RPM
| -rwxr-xr-x | Build-tools/mysql-copyright | 1 | ||||
| -rw-r--r-- | Docs/Makefile.am | 7 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index f3a2a2960ea..231482806ee 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -101,6 +101,7 @@ sub main # on the toplevel of the directory instead. file 'PUBLIC' shouldn't # exist in the new mysql distributions, but let's be sure.. unlink("$destdir/PUBLIC", "$destdir/README"); + unlink("$destdir/COPYING", "$destdir/EXCEPTIONS"); copy("$WD/Docs/MySQLEULA.txt", "$destdir"); # remove readline subdir and update configure accordingly diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 9a77202a91b..fe203a4d0bf 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \ all: $(targets) txt_files -txt_files: ../INSTALL-SOURCE ../COPYING \ +txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt CLEAN_FILES: $(BUILD_SOURCES) @@ -202,7 +202,10 @@ INSTALL-BINARY: mysql.info $(GT) perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@ ../COPYING: mysql.info $(GT) - perl -w $(GT) mysql.info "GPL license" "Function Index" > $@ + perl -w $(GT) mysql.info "GPL license" "MySQL FOSS License Exception" > $@ + +../EXCEPTIONS: mysql.info $(GT) + perl -w $(GT) mysql.info "MySQL FOSS License Exception" "Function Index" > $@ ../support-files/MacOSX/ReadMe.txt: mysql.info $(GT) perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index ea64f5ccfbd..d78a7ee28b9 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -86,7 +86,7 @@ do done for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - MySQLEULA.txt LICENSE.doc README.NW + EXCEPTIONS MySQLEULA.txt LICENSE.doc README.NW do if [ -f $i ] then diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5ddc19580f3..9670ccf569d 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -446,7 +446,7 @@ fi %files server %defattr(-,root,root,0755) -%doc COPYING README +%doc COPYING EXCEPTIONS README %doc Docs/manual.{html,ps,texi,txt} %doc Docs/manual_toc.html %doc support-files/my-*.cnf |