From: Ian Lynagh Date: Fri, 7 Sep 2007 12:14:14 +0000 (+0000) Subject: Fix publishing X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=33c2369367f33de4f5754454bd099afc3811ad1a Fix publishing Paths like c:/foo/bar get misinterpreted by rsync (really SSH?), as it thinks we want /foo/bar on the machine c. --- diff --git a/Makefile b/Makefile index 486b5e0..302c522 100644 --- a/Makefile +++ b/Makefile @@ -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!"