summaryrefslogtreecommitdiff
path: root/bindisttest/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-09-27 21:50:31 +0000
committerIan Lynagh <igloo@earth.li>2009-09-27 21:50:31 +0000
commit40954fdc884baddffcb88d2b69ced83e7ef305ee (patch)
tree755c38afd2fe4e7d34a31556f6ab5c7018814f17 /bindisttest/Makefile
parentff1b272a824d1189476daf7fe028496a4138f65d (diff)
downloadhaskell-40954fdc884baddffcb88d2b69ced83e7ef305ee.tar.gz
Follow bindist changes in bindisttest
Also add support for testing the bindistprep tarball, for when we are validating.
Diffstat (limited to 'bindisttest/Makefile')
-rw-r--r--bindisttest/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 71cb578ef1..0ac92265bc 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -19,6 +19,12 @@ default_target: all
TOP=..
include $(TOP)/mk/config.mk
+ifeq "$(TEST_PREP)" "YES"
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_PREP_TAR_BZ2)
+else
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2)
+endif
+
all:
$(RM) -rf $(BIN_DIST_INST_SUBDIR)
$(RM) -rf a/b/c/*
@@ -26,7 +32,7 @@ all:
# We use the a/b/c subdirectory as configure looks for install-sh in
# . .. ../.. and we don't want it to find the build system's install-sh.
# --force-local makes tar not think that c:/foo refers to a remote file
- cd a/b/c/ && $(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2)
+ cd a/b/c/ && $(TAR) --force-local -jxf ../../../$(BIN_DIST_TEST_TAR_BZ2)
ifeq "$(Windows)" "YES"
mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else