Commit dca732f1 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-4.1
parents e9687c10 13ed403f

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 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ pkgdata_DATA = my-small.cnf \ 
			my-huge.cnf \

      my-innodb-heavy-4G.cnf \

			mysql-log-rotate \

			mysql-@VERSION@.spec \

			MySQL-shared-compat.spec \

			binary-configure \

			ndb-config-2-node.ini



pkgdata_SCRIPTS =	mysql.server