Commit d5ee74c9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-4.1

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

parents 058d5bff 32e29cd7
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -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 −1
Original line number Diff line number Diff line
#!/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
+2 −2
Original line number Diff line number Diff line
#!/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>)
+3 −0
Original line number Diff line number Diff line
@@ -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 \