diff options
| -rw-r--r-- | bindisttest/Makefile | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile index ecd029afd9..bc805c8494 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -21,9 +21,9 @@ include $(TOP)/mk/tree.mk include $(TOP)/mk/config.mk ifeq "$(TEST_PREP)" "YES" -BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_PREP_TAR_BZ2) +BIN_DIST_TEST_TAR_COMP = ../$(BIN_DIST_PREP_TAR_COMP) else -BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2) +BIN_DIST_TEST_TAR_COMP = ../$(BIN_DIST_TAR_COMP) endif all: @@ -36,7 +36,7 @@ all: # NB. tar has funny interpretation of filenames sometimes (thinking # c:/foo is a remote file), so it's safer to bzip and then pipe into # tar rather than using tar -xjf: - cd a/b/c/ && $(BZIP2_CMD) -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf - + cd a/b/c/ && $(TAR_COMP_CMD) -cd ../../../$(BIN_DIST_TEST_TAR_COMP) | $(TAR_CMD) -xf - ifeq "$(Windows)" "YES" mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR) else diff --git a/mk/config.mk.in b/mk/config.mk.in index ce58302292..6fec58924e 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -387,8 +387,8 @@ endif BIN_DIST_NAME = ghc-$(ProjectVersion) BIN_DIST_PREP_DIR = bindistprep/$(BIN_DIST_NAME) BIN_DIST_PREP_TAR = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar -BIN_DIST_PREP_TAR_BZ2 = $(BIN_DIST_PREP_TAR).bz2 -BIN_DIST_TAR_BZ2 = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 +BIN_DIST_PREP_TAR_COMP = $(BIN_DIST_PREP_TAR).$(TAR_COMP_EXT) +BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT) # ----------------------------------------------------------------------------- # Utilities programs: flags |