Commit 8bdfffbe authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-4.0
parents af1dfb61 d207bd81

scripts/Makefile.am

+1 −5
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ bin_SCRIPTS = @server_scripts@ \ 
			mysqldumpslow \

			mysql_explain_log \

			mysql_tableinfo \

			mysqld_multi \

			make_win_src_distribution \

			make_win_binary_distribution

			mysqld_multi



EXTRA_SCRIPTS =		make_binary_distribution.sh \

			make_sharedlib_distribution.sh \
@@ -63,8 +61,6 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ 
			mysqlaccess.conf \

			mysqlbug



pkgdata_DATA =		make_binary_distribution make_sharedlib_distribution



# mysqlbug should be distributed built so that people can report build

# failures with it.

CLEANFILES =		@server_scripts@ \

support-files/MacOSX/Makefile.am

+0 −6
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ EXTRA_DIST = Info.plist.sh \ 
		StartupItem.Info.plist \

		StartupItem.postinstall



pkgdata_DATA =	Info.plist \

		Description.plist \

		StartupParameters.plist \

		postinstall \

		preinstall



CLEANFILES =	Info.plist \

		Description.plist \

		StartupParameters.plist \

support-files/Makefile.am

+1 −3
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ pkgdata_DATA = my-small.cnf \ 
			my-huge.cnf \

      my-innodb-heavy-4G.cnf \

			mysql-log-rotate \

			mysql-@VERSION@.spec \

			binary-configure \

			MySQL-shared-compat.spec

			binary-configure



pkgdata_SCRIPTS =	mysql.server