Make boot handle getting the libraries

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 1e79212..edc0433 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,10 +72,15 @@ check-packages :
        @for d in `cat libraries/core-packages`; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \
-            echo "maybe you haven't done 'sh darcs-all get'?"; \
+            echo "Did you run 'sh boot' at the top level?"; \
             exit 1; \
          fi \
        done
+       @if test ! -e libraries/base/configure; then \
+           echo "Looks like you're missing base's configure script."; \
+           echo "Did you run 'sh boot' at the top level?"; \
+           exit 1; \
+       fi
 
 stage1 : check-packages
        $(MAKE) -C utils/mkdependC boot
@@ -396,7 +401,7 @@ endif
 
 .PHONY: fiddle-binary-dist
 fiddle-binary-dist:
-       cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) && ../distrib/prep-bin-dist-mingw
+       cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 # Tar up the distribution and build a manifest
 binary-dist :: tar-binary-dist