X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=bindisttest%2FMakefile;h=8e2b9112145eadad47a3a2d09add9d8f13431b6e;hp=c26ca79f680d237dfe977e7c89178800be3da4ea;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hpb=cafb1e0f6bb93fb720e3bb3432c777cd9736bf80

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index c26ca79..8e2b911 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -6,13 +6,14 @@ 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/boilerplate.mk
+include $(TOP)/mk/config.mk
 
 all:
-	$(RM) -rf installed
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
 	$(RM) -rf ghc*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-	$(TAR) -jxf $(BIN_DIST_TARBALL)
+	# --force-local makes tar not think that c:/foo refers to a remote file
+	$(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2)
 ifeq "$(Windows)" "YES"
 	mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
@@ -24,7 +25,7 @@ endif
 	$(CONTEXT_DIFF) output expected_output
 
 clean distclean:
-	$(RM) -rf installed
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
 	$(RM) -rf ghc*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output