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

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index cfcf13b..8e2b911 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -6,27 +6,26 @@ 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
-
-INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
+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) $(INST_DIR)
+	mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd $(BIN_DIST_NAME) && ./configure --prefix=$(INST_DIR)
+	cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
 	cd $(BIN_DIST_NAME) && make install
 endif
-	$(INST_DIR)/bin/ghc --make HelloWorld
+	$(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
 	./HelloWorld > output
 	$(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