diff options
| author | unknown <monty@mysql.com> | 2004-03-20 12:49:17 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-20 12:49:17 +0200 |
| commit | 612c949418e869564cf7e04dabb5f3b05c137892 (patch) | |
| tree | 28dbdf85ca8fb1ef4d8281e2caa779295996e42d /Build-tools | |
| parent | 609df311978e24db03d74a6c0d2cdf7003ac57b3 (diff) | |
| parent | 3e5f1eaecf21e3b2fde0c86838d6740a939b921f (diff) | |
| download | mariadb-git-612c949418e869564cf7e04dabb5f3b05c137892.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
mysys/mf_soundex.c:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-pkg | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Build-tools/Do-pkg b/Build-tools/Do-pkg index 4d0f120c6e3..2fd1946ed0e 100755 --- a/Build-tools/Do-pkg +++ b/Build-tools/Do-pkg @@ -61,6 +61,12 @@ else } $PM= "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; +# Try another location on 10.3.3 +unless (-e "$PM") +{ + $PM= "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; +} + $TMP= $ENV{TMPDIR}; $TMP eq "" ? $TMP= $TMP . "/PKGBUILD.$$": $TMP= "/tmp/PKGBUILD.$$"; $PKGROOT= "$TMP/PMROOT"; @@ -79,6 +85,9 @@ $BUILDDIR= "$PWD/$HOST"; $SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>; $SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>; $TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>; +$TAR =~ /.*\/$NAME(.*)\.tar\.gz$/; +$ARCH= $1; +$NAME= $NAME . $ARCH; $INFO= <$SUPFILEDIR/Info.plist>; $DESC= <$SUPFILEDIR/Description.plist>; $SI_INFO= <$SUPFILEDIR/StartupItem.Info.plist>; @@ -167,7 +176,7 @@ unless (-f "$RESOURCE_DIR/License.txt"); &logger("Extracting $TAR to $PKGROOT"); &run_command("gnutar zxf $TAR -C $PKGROOT", "Unable to extract $TAR!"); &run_command("cd $PKGROOT ; ln -s mysql* ./mysql", "Unable to create symlink!"); -&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!"); +&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!"); # Now build the PGK using PackageMaker # The "|| true" is a nasty hack to work around a problem with Package Maker @@ -196,7 +205,7 @@ unless ($opt_skip_si) copy("$SI_PARAMS", "$PKGROOT/MySQL/") or &abort("Error copying $SI_PARAMS!"); chmod(0644, "$PKGROOT/MySQL/" . basename("$SI_PARAMS")); - &run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!"); + &run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!"); copy("$SI_POST", "$RESOURCE_DIR/postinstall") or &abort("Error copying $SI_POST!"); chmod(0644, "$RESOURCE_DIR/postinstall"); |