Rework the build system a bit

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 787a48e..4491369 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,7 @@ endif
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
+       $(INSTALL_DIR) $(bindir)
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
        for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \
@@ -248,10 +249,6 @@ BINARY_DIST_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d)
 binary-dist:: binary-dist-pre $(BINARY_DIST_PRE_RULES)
 
 binary-dist-pre::
-ifeq "$(BIN_DIST)" ""
-       @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk"
-       @false
-endif
        -rm -rf $(BIN_DIST_DIR)
        -$(RM) $(BIN_DIST_DIR).tar.gz
        $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)
@@ -425,7 +422,7 @@ endif
 .PHONY: publish-binary-dist
 publish-binary-dist ::
        @for f in $(PUBLISH_FILES); do \
-           @for i in 0 1 2 3 4 5 6 7 8 9; do \
+           for i in 0 1 2 3 4 5 6 7 8 9; do \
                echo "Try $$i: $(PublishCp) $$f $(PublishLocation)/dist"; \
                if $(PublishCp) $$f $(PublishLocation)/dist; then break; fi; \
            done \
@@ -517,12 +514,12 @@ dist ::
 ifneq "$(PublishLocation)" ""
 dist ::
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
-               echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)"; \
-               if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation); then break; fi\
+               echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
+               if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\
        done
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
-               echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)"; \
-               if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation); then break; fi\
+               echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
+               if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
        done
 endif