GHC new build system megapatch

[ghc-hetmet.git] / bindisttest / Makefile

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index cfcf13b..8e2b911 100644 (file)
--- 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