From b8138e0cf274a0575240ea02e5349505eafacae6 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 21 Mar 2014 15:21:45 -0700
Subject: [PATCH] mk: Wire up everything to dist and distcheck

Fix some misc bugs
---
 mk/dist.mk | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 60855ab58a3..79c0f271b2e 100644
--- a/mk/dist.mk
+++ b/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