- Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux)

support-files/MacOSX/Makefile.am:
  Auto merged
scripts/Makefile.am:
  - manual merge
support-files/Makefile.am:
  - manual merge

support-files/MacOSX/Makefile.am

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

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