X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=d1426c77aaad705b74beb93de3d3e111235e3f16;hp=486b5e08d52b62aaaa13885376548f71a9426794;hb=e05f9de137269701df667b69d741dfae616694f7;hpb=b18545dd4fc38d2c78d18966d1d9e38474c799e9 diff --git a/Makefile b/Makefile index 486b5e0..d1426c7 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,10 @@ endif SUBDIRS = gmp includes compat utils driver docs rts libraries compiler -# Sanity check that all the core libraries are in the tree, to catch +# Sanity check that all the boot libraries are in the tree, to catch # failure to run darcs-all. check-packages : - @for d in `cat libraries/core-packages`; do \ + @for d in `cat libraries/boot-packages`; do \ if test ! -d libraries/$$d; then \ echo "Looks like you're missing libraries/$$d,"; \ echo "maybe you haven't done './darcs-all get'?"; \ @@ -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!"