X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=302c522dd03fd1f223fa11068092bdf769b6a0d4;hb=0ecf634bfc122cdb81e7569718e27c880cd2c40f;hp=61b49e61820aaca697ef16f1ba276f4c25e1fba4;hpb=cafb1e0f6bb93fb720e3bb3432c777cd9736bf80;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 61b49e6..302c522 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ binary-dist::
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
-	$(MAKE) prefix=$(BIN_DIST_DIR) install
+	$(MAKE) DESTDIR=$(BIN_DIST_DIR) prefix=/. install
 
 binary-dist::
 	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
@@ -430,8 +430,19 @@ publish-binary-dist ::
 # You need to first make binddisttest, and then run
 #     make publish 'prefix=$(BIN_DIST_INST_DIR)'
 # for this to find the right place.
+
+# We assume that Windows means Cygwin, as we can't just use docdir
+# unchanged or rsync (really SSH?) thinks that c:/foo means /foo on
+# the machine c.
+
+ifeq "$(Windows)" "YES"
+PUBLISH_DOCDIR = $(shell cygpath --unix $(docdir))
+else
+PUBLISH_DOCDIR = $(docdir)
+endif
+
 publish-binary-dist ::
-	$(PublishCp) -r $(docdir)/* $(PublishLocation)/docs
+	$(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs
 
 binary-dist::
 	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"