Commit d3095410 authored by unknown's avatar unknown
Browse files

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/space/my/mysql-4.0
parents 963e45b9 d62dff22

Build-tools/mysql-copyright

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

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

    

    # remove readline subdir and update configure accordingly

Docs/Makefile.am

+5 −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 \

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" > $@

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ do 
done



for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \

         MySQLEULA.txt LICENSE.doc README.NW

         EXCEPTIONS MySQLEULA.txt LICENSE.doc README.NW

do

  if [ -f $i ]

  then

support-files/mysql.spec.sh

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ fi 
%files server

%defattr(-,root,root,0755)



%doc COPYING README

%doc COPYING EXCEPTIONS README 

%doc Docs/manual.{html,ps,texi,txt}

%doc Docs/manual_toc.html

%doc support-files/my-*.cnf