---

yaml
---
r: 109338
b: refs/heads/dist-snap
c: b8138e0
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: dd7a60e0c3090488041788256f211e2d02636b73
+refs/heads/dist-snap: b8138e0cf274a0575240ea02e5349505eafacae6
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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