diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | bindisttest/Makefile | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -314,8 +314,8 @@ binary-dist :: tar-binary-dist .PHONY: tar-binary-dist tar-binary-dist: - ( cd $(BIN_DIST_TOPDIR_ABS); $(TAR) cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) ) - ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | $(TAR) tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) ) + ( cd $(BIN_DIST_TOPDIR_ABS); $(TAR) cf - $(BIN_DIST_NAME) | bzip2 > $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) ) + ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) | $(TAR) tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) ) else @@ -412,7 +412,7 @@ endif # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source # tree then we want to include the real file, not a symlink to it $(TAR) hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST) - cd $(BIN_DIST_PREP_DIR) && $(TAR) rf $(BIN_DIST_TAR) $(BIN_DIST_NAME) + cd $(BIN_DIST_PREP_DIR) && $(TAR) rf ../$(BIN_DIST_TAR) $(BIN_DIST_NAME) bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2) $(TAR) tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion) endif diff --git a/bindisttest/Makefile b/bindisttest/Makefile index e6e2ed7292..c14a08577b 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -13,7 +13,7 @@ all: $(RM) -rf ghc* $(RM) HelloWorld HelloWorld.o HelloWorld.hi output # --force-local makes tar not think that c:/foo refers to a remote file - $(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2) + $(TAR) --force-local -jxf $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) ifeq "$(Windows)" "YES" mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR) else diff --git a/mk/config.mk.in b/mk/config.mk.in index bf97a16379..5bcd5f9796 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -547,7 +547,7 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS) BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME) BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TAR=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar +BIN_DIST_TAR=$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2 BIN_DIST_PREP_DIR=$(FPTOOLS_TOP_ABS)/bindist-prep BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME) |