Merge mysql.com:/space/my/mysql-4.0-merge

into mysql.com:/space/my/mysql-4.1-merge

4 files changed, 16 insertions, 7 deletions

diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index 86773f12339..d751ed7ca5b 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -20,19 +20,25 @@
 EXTRA_DIST =	Info.plist.sh \
 		Description.plist.sh \
 		StartupParameters.plist.sh \
-		postinstall.sh \
-		preinstall.sh \
+		postflight.sh \
+		preflight.sh \
 		ReadMe.txt \
 		MySQLCOM \
 		StartupItem.Description.plist \
 		StartupItem.Info.plist \
 		StartupItem.postinstall
 
+noinst_DATA = Info.plist \
+		Description.plist \
+		StartupParameters.plist \
+		postflight \
+		preflight
+
 CLEANFILES =	Info.plist \
 		Description.plist \
 		StartupParameters.plist \
-		postinstall \
-		preinstall
+		postflight \
+		preflight
 
 SUFFIXES = .sh
 
diff --git a/support-files/MacOSX/postinstall.sh b/support-files/MacOSX/postflight.sh
index ff921d3fee9..451eb65e0d7 100644
--- a/support-files/MacOSX/postinstall.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# postinstall - this script will be executed after the MySQL PKG
+# postflight - this script will be executed after the MySQL PKG
 # installation has been performed.
 #
 # This script will install the MySQL privilege tables using the
diff --git a/support-files/MacOSX/preinstall.sh b/support-files/MacOSX/preflight.sh
index 62772573c46..700d0640a9e 100644
--- a/support-files/MacOSX/preinstall.sh
+++ b/support-files/MacOSX/preflight.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# preinstall - this script will be executed before the MySQL PKG
+# preflight - this script will be executed before the MySQL PKG
 # installation will be performed.
 #
 # If this package has been compiled with a prefix ending with "mysql" (e.g.
-# /usr/local/mysql or /opt/mysql), it will rename any previosuly existing
+# /usr/local/mysql or /opt/mysql), it will rename any previously existing
 # directory with this name before installing the new package (which includes
 # a symlink named "mysql", pointing to the newly installed directory, which
 # is named mysql-<version>)
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index d83dd8ee74d..972d1dc7038 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -43,6 +43,9 @@ pkgdata_DATA =		my-small.cnf \
 
 pkgdata_SCRIPTS =	mysql.server
 
+noinst_DATA = mysql-@VERSION@.spec \
+			MySQL-shared-compat.spec
+
 CLEANFILES =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \