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

diff --git a/ghc.mk b/ghc.mk
index 8bef397..91bf43d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -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