X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=bindisttest%2FMakefile;h=238bce76504e284a85292fd57914052dbcc16840;hp=1abbd788a226a1fb17fbd2d7af890000d35c38dc;hb=1a9245caefb80a3c4c5965aaacdf9a607e792e1c;hpb=bb60c721074fba76f4909c6aa8096df1dfcaa914

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 1abbd78..238bce7 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -17,33 +17,49 @@ default_target: all
 # Ideally we'd just include something to give us variables
 # for paths and arguments to tools etc, and those set in mk/build.mk.
 TOP=..
+include $(TOP)/mk/tree.mk
 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
+	"$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+	"$(RM)" $(RM_OPTS_REC) a/b/c/*
+	"$(RM)" $(RM_OPTS) 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_CMD) -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -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)
-	$(RM) -rf ghc*
-	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
+	"$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+	"$(RM)" $(RM_OPTS_REC) a/b/c/*
+	"$(RM)" $(RM_OPTS) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets
 install install-docs doc:
 	@:
 
+show:
+	@echo '$(VALUE)="$($(VALUE))"'
+