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

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index cfcf13b..e7f9aa4 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,28 +17,42 @@ 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
 
-INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
+ifeq "$(TEST_PREP)" "YES"
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_PREP_TAR_BZ2)
+else
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2)
+endif
 
 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)
+# 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.
+#
+# NB. tar has funny interpretation of filenames sometimes (thinking
+# c:/foo is a remote file), so it's safer to bzip and then pipe into
+# tar rather than using tar -xjf:
+	cd a/b/c/ && bzip2 -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR) -xf -
 ifeq "$(Windows)" "YES"
-	mv $(BIN_DIST_NAME) $(INST_DIR)
+	mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd $(BIN_DIST_NAME) && ./configure --prefix=$(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
-	$(INST_DIR)/bin/ghc --make HelloWorld
+	$(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
+# Without --no-user-package-conf we might pick up random packages from ~/.ghc
+	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
 
 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