@@ -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 bindisttest/Makefile fdfc0e376450152cca9dc4100ec97605db5de9ba Ian Lynagh igloo@earth.li http://github.com/ghc-hq/ghc/commit/1b65750b55ab9b1bddf4f33f935d8eab5bb5cf84 1b65750b55ab9b1bddf4f33f935d8eab5bb5cf84 2009-09-27T14:50:31-07:00 2009-09-27T14:50:31-07:00 Follow bindist changes in bindisttest Also add support for testing the bindistprep tarball, for when we are validating. 601ba554601b532f7ec9410b6abea10c4fcb5002 Ian Lynagh igloo@earth.li