summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-08-05 01:54:04 +0200
committerunknown <lenz@mysql.com>2004-08-05 01:54:04 +0200
commitd62dff227d8d9c3358a31ecf99cf095fb129d864 (patch)
tree31c74b5bf320b1e071239c7949bf6f30bee8e600 /Docs
parentf618dd6a258cafb76a22f394c88906d85cc3ee35 (diff)
downloadmariadb-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
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Makefile.am7
1 files changed, 5 insertions, 2 deletions
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" > $@