Clean the right directory in bindisttest

[ghc-hetmet.git] / bindisttest / Makefile

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index b2cb231..aa36a2c 100644 (file)
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -1,3 +1,14 @@
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
 
 .PHONY: default_target
 
@@ -6,26 +17,30 @@ 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 $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
+       $(RM) -rf a/b/c/*
        $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-       $(TAR) -jxf $(BIN_DIST_TARBALL)
+# 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)
 ifeq "$(Windows)" "YES"
-       mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
+       mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-       cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
-       cd $(BIN_DIST_NAME) && make install
+       cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
+       cd a/b/c/$(BIN_DIST_NAME) && make install
 endif
        $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
        ./HelloWorld > output
        $(CONTEXT_DIFF) output expected_output
+       $(BIN_DIST_INST_DIR)/bin/ghc-pkg check
 
 clean distclean:
        $(RM) -rf $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
+       $(RM) -rf a/b/c/*
        $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets