Commit dc82282e authored by unknown's avatar unknown
Browse files

- More changes to include the FLOSS License Exception in the 

   various distributions


Docs/Makefile.am:
   - Honoured node name change in manual.texi FOSS->FLOSS
Makefile.am:
   - actually add EXCEPTIONS to the source distribution
scripts/make_win_src_distribution.sh:
   - add EXCEPTIONS to the Windows source distribution, too
parent d3095410

Docs/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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" > $@

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
AUTOMAKE_OPTIONS =	foreign



# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README COPYING 

EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ pstack @sql_client_dirs@ \

			@sql_server_dirs@ scripts man tests \

scripts/make_win_src_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ touch $BASE/innobase/ib_config.h 
#



cd $SOURCE

for i in COPYING ChangeLog README \

for i in COPYING ChangeLog README EXCEPTIONS\

         INSTALL-SOURCE INSTALL-WIN \

         INSTALL-WIN-SOURCE \

         Docs/manual_toc.html  Docs/manual.html \