X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2FMakefile;h=e7f9aa49a7b476a9110d4db22c5e617ac726576e;hb=302e2e29f2e1074bfba561e077a484dc4e1d15f6;hp=71cb578ef15e58295750e61223663773298d2125;hpb=51c08cf9d24151e79318e0a176898230997a68e4;p=ghc-hetmet.git

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 71cb578..e7f9aa4 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -19,26 +19,36 @@ 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/*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
 # 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)
+#
+# 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 -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR) -xf -
 ifeq "$(Windows)" "YES"
 	mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
 	cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
-	cd a/b/c/$(BIN_DIST_NAME) && make install
+	cd a/b/c/$(BIN_DIST_NAME) && $(MAKE) install
 endif
 	$(BIN_DIST_INST_DIR)/bin/runghc HelloWorld > output
 	$(CONTEXT_DIFF) output expected_output
 	$(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
 	./HelloWorld > output
 	$(CONTEXT_DIFF) output expected_output
-	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check
+# Without --no-user-package-conf we might pick up random packages from ~/.ghc
+	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
 
 clean distclean:
 	$(RM) -rf $(BIN_DIST_INST_SUBDIR)