---

yaml
---
r: 102243
b: refs/heads/master
c: 4d4ccb5
h: refs/heads/master
i:
  102241: f73e331
  102239: 6b83374
v: v3

Author: bleibig

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bbec2c54edd347b084734d01826675ae2dffc636
+refs/heads/master: 4d4ccb5d81362999ab9dc9534b507340995ad0ac
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/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)