summaryrefslogtreecommitdiff
path: root/bindisttest
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-02-26 22:20:52 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-02-26 22:26:25 +0100
commit32f41c79960ffc1d04c4573acb37756109d279a5 (patch)
tree77a78d7e0eafe3057f49a1ace4f39fb7800fb1eb /bindisttest
parent98b6756b09194352aa2ccfbb624992150a7a3520 (diff)
downloadhaskell-32f41c79960ffc1d04c4573acb37756109d279a5.tar.gz
Make distribution tarball compression format configurable
By default, bzip2 compression is selected (which is what has been used till now). Additionally, by setting the TAR_COMP make variable to one of the values "bzip2", "gzip", or "xz", an explicit compression format can be requested for the distribution tarballs. For instance, invoking make TAR_COMP=xz sdist-ghc will result in a tarball `./sdistprep/ghc-7.9.20140226-src.tar.xz` Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'bindisttest')
-rw-r--r--bindisttest/ghc.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index 0126e391d8..4b211064b1 100644
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
@@ -11,9 +11,9 @@
# -----------------------------------------------------------------------------
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
.PHONY: test_bindist
@@ -33,7 +33,7 @@ test_bindist:
mkdir bindisttest/a
mkdir bindisttest/a/b
mkdir bindisttest/a/b/c
- cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
+ cd bindisttest/a/b/c/ && $(TAR_COMP_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_COMP) | $(TAR_CMD) -xf -
$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
ifeq "$(Windows_Host)" "YES"
mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)