X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2FMakefile;h=71cb578ef15e58295750e61223663773298d2125;hb=51c08cf9d24151e79318e0a176898230997a68e4;hp=d29c3d8b7ae67c89486c7cd01057ebf38a931a82;hpb=f700c53dceab14939616be22d114f6509caa3aad;p=ghc-hetmet.git

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index d29c3d8..71cb578 100644
--- 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,24 +17,32 @@ 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 ghc*
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
+	$(RM) -rf a/b/c/*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-	$(TAR) -jxf $(BIN_DIST_TARBALL)
-	cd $(BIN_DIST_NAME) && ./configure --prefix=$(INST_DIR)
-	cd $(BIN_DIST_NAME) && make install
-	$(INST_DIR)/bin/ghc --make HelloWorld
+# 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 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
+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
 
 clean distclean:
-	$(RM) -rf installed
-	$(RM) -rf ghc*
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
+	$(RM) -rf a/b/c/*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets