diff options
| author | unknown <lenz@mysql.com> | 2005-08-12 08:13:02 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-08-12 08:13:02 +0200 |
| commit | 32e29cd7e2b8545c4c8c972803b720c0905453db (patch) | |
| tree | e440b2049eadce6dfc7180c252583c89086cf851 /support-files/MacOSX | |
| parent | 0ba4be2bd4d9a301e7e7fc1088e5d2b859789324 (diff) | |
| parent | e11a23a8aa2493dc455b5f85e0e894cc944836a0 (diff) | |
| download | mariadb-git-32e29cd7e2b8545c4c8c972803b720c0905453db.tar.gz | |
Merge mysql.com:/space/my/mysql-4.0-merge
into mysql.com:/space/my/mysql-4.1-merge
support-files/MacOSX/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
support-files/MacOSX/postflight.sh:
Auto merged
Diffstat (limited to 'support-files/MacOSX')
| -rw-r--r-- | support-files/MacOSX/Makefile.am | 14 | ||||
| -rw-r--r-- | support-files/MacOSX/postflight.sh (renamed from support-files/MacOSX/postinstall.sh) | 2 | ||||
| -rw-r--r-- | support-files/MacOSX/preflight.sh (renamed from support-files/MacOSX/preinstall.sh) | 4 |
3 files changed, 13 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>) |