bk commit into 4.0 tree (lenz:1.2128) BUG#12506

[lenz]

Below is the list of changes that have just been committed into a local
4.0 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.2128 05/08/11 20:13:12 lenz@stripped +2 -0
  - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
    change was too drastic) (BUG#12506)

  support-files/Makefile.am
    1.23 05/08/11 20:13:10 lenz@stripped +3 -0
    - make sure that the RPM spec files are built, but not installed by "make install"

  support-files/MacOSX/Makefile.am
    1.7 05/08/11 20:13:10 lenz@stripped +6 -0
    - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
      change was too drastic) (BUG#12506)

# 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.0-merge

--- 1.22/support-files/Makefile.am	2005-07-20 19:15:46 +02:00
+++ 1.23/support-files/Makefile.am	2005-08-11 20:13:10 +02:00
@@ -41,6 +41,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.6/support-files/MacOSX/Makefile.am	2005-07-20 19:15:46 +02:00
+++ 1.7/support-files/MacOSX/Makefile.am	2005-08-11 20:13:10 +02:00
@@ -28,6 +28,12 @@
 		StartupItem.Info.plist \
 		StartupItem.postinstall
 
+noinst_DATA = Info.plist \
+		Description.plist \
+		StartupParameters.plist \
+		postinstall \
+		preinstall
+
 CLEANFILES =	Info.plist \
 		Description.plist \
 		StartupParameters.plist \