Refer to "boot" libs, not "core" libs

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 61b49e6..d1426c7 100644 (file)
--- 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'?"; \
@@ -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!"