X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=42e2ad6cfc973c5e274222bd442afb97c7689eda;hb=d78bbf92ef95e687d7706f44acfce91cd39eea60;hp=8bef39767651fcf4863fb77453efb3e6f1f94b9f;hpb=ff67c61cf3665937237e7f6b720d8425089f3f25;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 8bef397..42e2ad6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -299,7 +299,7 @@ DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
 # Packages that, if present, must be built by the stage2 compiler,
 # because they use TH and/or annotations, or depend on other stage2
 # packages:
-STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010
+STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random
 # Packages that we shouldn't build if we don't have TH (e.g. because
 # we're building a profiled compiler):
 TH_PACKAGES := $(DPH_PACKAGES)
@@ -1016,10 +1016,10 @@ $(eval $(call bindist,.,\
     bindist.mk \
     libraries/gen_contents_index \
     libraries/prologue.txt \
-    libraries/dph/LICENSE \
-    libraries/dph/ghc-packages \
-    libraries/dph/ghc-packages2 \
-    libraries/dph/ghc-stage2-package \
+    $(wildcard libraries/dph/LICENSE \
+               libraries/dph/ghc-packages \
+               libraries/dph/ghc-packages2 \
+               libraries/dph/ghc-stage2-package) \
  ))
 endif
 # mk/project.mk gets an absolute path, so we manually include it in
@@ -1076,9 +1076,15 @@ ifeq "$(mingw32_TARGET_OS)" "1"
 	$(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist)
 endif
 
+ifeq "$(mingw32_TARGET_OS)" "1"
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/doc
+else
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/share/doc/ghc
+endif
+
 .PHONY: publish-docs
 publish-docs:
-	$(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs)
+	$(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs)
 
 # -----------------------------------------------------------------------------
 # Source distributions