[commit: ghc] ghc-7.8: Follow-up to 32f41c79 (e9212f0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/e9212f0edbd3fddc3836ccded10d036c01d38505/ghc

>---------------------------------------------------------------

commit e9212f0edbd3fddc3836ccded10d036c01d38505
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Feb 26 23:51:23 2014 +0100

    Follow-up to 32f41c79
    
    These parts were forgotten to be committed together with the rest of
    32f41c79960ffc1d04c4573acb37756109d279a5
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>
    
    (cherry picked from commit b1ee32edbe9be7b695cce7975450782e0a290c47)


>---------------------------------------------------------------

e9212f0edbd3fddc3836ccded10d036c01d38505
 bindisttest/Makefile |    6 +++---
 mk/config.mk.in      |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index ecd029a..bc805c8 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 ce58302..6fec589 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