From e5cb60dcaad6a17a6368321e7a02ed9299c8c5ac Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 5 Aug 2004 01:54:04 +0200
Subject:  - applied the required changes to create the FOSS License exception 
   file "EXCEPTIONS" and include it in the source and binary    distributions

---
 Docs/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Docs')

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" > $@
-- 
cgit v1.2.1


From 26f0fdd5e8c8ddf745105f823cd2dfadc9e02a70 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 5 Aug 2004 11:22:02 +0200
Subject:  - More changes to include the FLOSS License Exception in the   
 various distributions

---
 Docs/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Docs')

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index fe203a4d0bf..06e4b4cfd6a 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -202,10 +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" "MySQL FOSS License Exception" > $@
+	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@
 
 ../EXCEPTIONS: mysql.info $(GT)
-	perl -w $(GT) mysql.info "MySQL FOSS License Exception" "Function Index" > $@
+	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
 
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@
-- 
cgit v1.2.1


From 1097805cf2bdf833f7d07886c7a35b9af54ba068 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 5 Aug 2004 17:05:11 +0200
Subject:  - rename: EXCEPTIONS->EXCEPTIONS-CLIENT

---
 Docs/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Docs')

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 06e4b4cfd6a..a4e8e14a38d 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 ../EXCEPTIONS \
+txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
 CLEAN_FILES:		$(BUILD_SOURCES)
@@ -204,7 +204,7 @@ INSTALL-BINARY:	mysql.info $(GT)
 ../COPYING:		mysql.info $(GT)
 	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@
 
-../EXCEPTIONS: mysql.info $(GT)
+../EXCEPTIONS-CLIENT: mysql.info $(GT)
 	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
 
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
-- 
cgit v1.2.1