From 40954fdc884baddffcb88d2b69ced83e7ef305ee Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 27 Sep 2009 21:50:31 +0000 Subject: [PATCH] Follow bindist changes in bindisttest Also add support for testing the bindistprep tarball, for when we are validating. --- bindisttest/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bindisttest/Makefile b/bindisttest/Makefile index 71cb578..0ac9226 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 -- 1.7.10.4