X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=91bf43d6fe047d358b9a95e9418e41624163a856;hb=469c8c3c35a3e875f97ea03c12f61c631e2524cd;hp=150ca7d06037afac3a2155336dc2889782ba11ed;hpb=5e578e123d59c9590b4cf72515db448380de89bb;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 150ca7d..91bf43d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -986,16 +986,16 @@ $(eval $(call bindist,.,\
     $(INPLACE_BIN)/mkdirhier \
     $(INPLACE_BIN)/ghc-cabal \
     utils/ghc-pwd/ghc-pwd \
-	$(BINDIST_WRAPPERS) \
-	$(BINDIST_PERL_SOURCES) \
-	$(BINDIST_LIBS) \
-	$(BINDIST_HI) \
-	$(BINDIST_EXTRAS) \
-	$(includes_H_CONFIG) \
-	$(includes_H_PLATFORM) \
+    $(BINDIST_WRAPPERS) \
+    $(BINDIST_PERL_SOURCES) \
+    $(BINDIST_LIBS) \
+    $(BINDIST_HI) \
+    $(BINDIST_EXTRAS) \
+    $(includes_H_CONFIG) \
+    $(includes_H_PLATFORM) \
     $(includes_H_FILES) \
-	includes/ghcconfig.h \
-	includes/rts/Config.h \
+    includes/ghcconfig.h \
+    includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -1005,21 +1005,21 @@ $(eval $(call bindist,.,\
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
-	docs/index.html \
-	compiler/stage2/doc \
-	$(wildcard libraries/*/dist-install/doc/) \
-	$(wildcard libraries/*/*/dist-install/doc/) \
+    docs/index.html \
+    compiler/stage2/doc \
+    $(wildcard libraries/*/dist-install/doc/) \
+    $(wildcard libraries/*/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \
-	mk/project.mk \
-	mk/install.mk.in \
-	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 \
+    mk/project.mk \
+    mk/install.mk.in \
+    bindist.mk \
+    libraries/gen_contents_index \
+    libraries/prologue.txt \
+    $(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