bk commit into 4.1 tree (lenz:1.2371)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2371 05/08/12 08:13:02 lenz@stripped +3 -0
  Merge mysql.com:/space/my/mysql-4.0-merge
  into mysql.com:/space/my/mysql-4.1-merge

  support-files/MacOSX/postflight.sh
    1.6 05/08/12 08:13:01 lenz@stripped +0 -0
    Auto merged

  support-files/Makefile.am
    1.28 05/08/12 08:13:01 lenz@stripped +0 -0
    Auto merged

  support-files/MacOSX/postflight.sh
    1.5 05/08/12 08:13:01 lenz@stripped +0 -0
    Merge rename: support-files/MacOSX/postinstall.sh ->
support-files/MacOSX/postflight.sh

  support-files/MacOSX/Makefile.am
    1.8 05/08/12 08:13:01 lenz@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-merge/RESYNC

--- 1.27/support-files/Makefile.am	2005-07-20 21:47:04 +02:00
+++ 1.28/support-files/Makefile.am	2005-08-12 08:13:01 +02:00
@@ -43,6 +43,9 @@
 
 pkgdata_SCRIPTS =	mysql.server
 
+noinst_DATA = mysql-@VERSION@.spec \
+			MySQL-shared-compat.spec
+
 CLEANFILES =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \

--- 1.7/support-files/MacOSX/Makefile.am	2005-07-20 19:35:07 +02:00
+++ 1.8/support-files/MacOSX/Makefile.am	2005-08-12 08:13:01 +02:00
@@ -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
 

--- 1.4/support-files/MacOSX/postinstall.sh	2003-12-08 14:38:25 +01:00
+++ 1.6/support-files/MacOSX/postflight.sh	2005-08-12 08:13:01 +02:00
@@ -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