summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-18 19:57:55 +0200
committerserg@serg.mylan <>2004-08-18 19:57:55 +0200
commite1237cbc53355382e032f0e88f906d67edd1f597 (patch)
tree8ac7985dc9b6caddd1c2402ef8606e4a4cd85ada /Docs
parent7c69afaf15eda7d51b2254e71c7078aaab3aa0f3 (diff)
parent8ce92878a2c32785a5af86e9ffa27b4904d01694 (diff)
downloadmariadb-git-e1237cbc53355382e032f0e88f906d67edd1f597.tar.gz
manually merged
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 19b2efd4cab..491302a082a 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 ../INSTALL-WIN-SOURCE \
+txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
CLEAN_FILES: $(BUILD_SOURCES)
@@ -204,7 +204,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 FLOSS License Exception" > $@
+
+../EXCEPTIONS-CLIENT: mysql.info $(GT)
+ 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" > $@