From 4d4ccb5d81362999ab9dc9534b507340995ad0ac Mon Sep 17 00:00:00 2001 From: Brian Leibig Date: Wed, 26 Feb 2014 08:59:58 -0800 Subject: [PATCH] Make OS X installer build from /tmp/dist/pkgroot, and have it be part of the 'make dist' target --- mk/dist.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/dist.mk b/mk/dist.mk index 0eb0365a59976..17afeaae37732 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -107,7 +107,7 @@ distcheck: dist else -dist: $(PKG_TAR) +dist: $(PKG_TAR) $(PKG_OSX) distcheck: $(PKG_TAR) $(Q)rm -Rf dist @@ -133,7 +133,7 @@ ifeq ($(CFG_OSTYPE), apple-darwin) dist-prepare-osx: PREPARE_HOST=$(CFG_BUILD) dist-prepare-osx: PREPARE_TARGETS=$(CFG_BUILD) -dist-prepare-osx: PREPARE_DEST_DIR=pkgroot +dist-prepare-osx: PREPARE_DEST_DIR=tmp/dist/pkgroot dist-prepare-osx: PREPARE_STAGE=2 dist-prepare-osx: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) dist-prepare-osx: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) @@ -143,9 +143,9 @@ dist-prepare-osx: prepare-base $(PKG_OSX): Distribution.xml LICENSE.txt dist-prepare-osx @$(call E, making OS X pkg) - $(Q)pkgbuild --identifier org.rust-lang.rust --root pkgroot rust.pkg + $(Q)pkgbuild --identifier org.rust-lang.rust --root tmp/dist/pkgroot rust.pkg $(Q)productbuild --distribution Distribution.xml --resources . $(PKG_OSX) - $(Q)rm -rf pkgroot rust.pkg + $(Q)rm -rf tmp rust.pkg dist-osx: $(PKG_OSX)