Add HsCoreTy to HsType

[ghc-hetmet.git] / bindisttest / Makefile

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 2b56a05..238bce7 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,38 +17,49 @@ 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/tree.mk
+include $(TOP)/mk/config.mk
 
-ifeq "$(Windows)" "YES"
-BIN_DIST_INST_SUBDIR = "install dir"
+ifeq "$(TEST_PREP)" "YES"
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_PREP_TAR_BZ2)
 else
-# I very much doubt that paths with spaces will work on Unix
-BIN_DIST_INST_SUBDIR = installed
+BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2)
 endif
 
-BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR)
-
 all:
-       $(RM) -rf $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
-       $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-       $(TAR) -jxf $(BIN_DIST_TARBALL)
+       "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+       "$(RM)" $(RM_OPTS_REC) a/b/c/*
+       "$(RM)" $(RM_OPTS) HelloWorld HelloWorld.o HelloWorld.hi output
+# 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_CMD) -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
 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/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 $(BIN_DIST_INST_SUBDIR)
-       $(RM) -rf ghc*
-       $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
+       "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+       "$(RM)" $(RM_OPTS_REC) a/b/c/*
+       "$(RM)" $(RM_OPTS) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets
 install install-docs doc:
        @:
 
+show:
+       @echo '$(VALUE)="$($(VALUE))"'
+