Commit 06cd2efc authored by unknown's avatar unknown
Browse files

- rename: EXCEPTIONS->EXCEPTIONS-CLIENT

parent 74e86ee3

Build-tools/mysql-copyright

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +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");

    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");

    copy("$WD/Docs/MySQLEULA.txt", "$destdir");

    

    # remove readline subdir and update configure accordingly

Docs/Makefile.am

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

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 EXCEPTIONS

EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ pstack @sql_client_dirs@ \

			@sql_server_dirs@ scripts man tests \

libmysql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#

# There are special exceptions to the terms and conditions of the GPL as it

# is applied to this software. View the full text of the exception in file

# EXCEPTIONS in the directory of this software distribution.

# EXCEPTIONS-CLIENT in the directory of this software distribution.

# 

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#

# There are special exceptions to the terms and conditions of the GPL as it

# is applied to this software. View the full text of the exception in file

# EXCEPTIONS in the directory of this software distribution.

# EXCEPTIONS-CLIENT in the directory of this software distribution.

# 

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of