---

yaml
---
r: 106257
b: refs/heads/auto
c: b8138e0
h: refs/heads/master
i:
  106255: bdd4947
v: v3

Author: brson

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: dd7a60e0c3090488041788256f211e2d02636b73
+refs/heads/auto: b8138e0cf274a0575240ea02e5349505eafacae6
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/dist.mk

@@ -165,8 +165,15 @@ $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
 
 dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
 
+else
+
+dist-osx:
+
 endif
 
+# FIXME should do something
+distcheck-osx:
+
 
 ######################################################################
 # Unix binary installer tarballs
@@ -223,6 +230,7 @@ distcheck-tar-bins: dist-tar-bins
 # Just copy the docs to a folder under dist with the appropriate name
 # for uploading to S3
 dist-docs: docs compiler-docs
+	$(Q) rm -Rf dist/doc
 	$(Q) mkdir -p dist/doc/
 	$(Q) cp -r doc dist/doc/$(CFG_PACKAGE_VERS)
 
@@ -239,18 +247,18 @@ distcheck: dist
 	$(Q)rm -Rf tmp/distcheck
 	@echo
 	@echo -----------------------------------------------
-	@echo Rust ready for distribution (see ./dist)
+	@echo "Rust ready for distribution (see ./dist)"
 	@echo -----------------------------------------------
 
 else
 
-dist: dist-tar-src
+dist: dist-tar-src dist-osx dist-tar-bins dist-docs
 
-distcheck: dist distcheck-tar-src
+distcheck: dist distcheck-tar-src distcheck-osx distcheck-tar-bins
 	$(Q)rm -Rf tmp/distcheck
 	@echo
 	@echo -----------------------------------------------
-	@echo Rust ready for distribution (see ./dist)
+	@echo "Rust ready for distribution (see ./dist)"
 	@echo -----------------------------------------------
 
 endif