BIN_DIST_INST_SUBDIR Needs to be defined in config.mk so ./Makefile can see it

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 68f460e..5283f66 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -512,8 +512,6 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
 BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
 
-BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
-
 # Definition of installation directories, we don't use half of these, but since
 # the configure script has them on offer while passing through, we might as well
 # set them. Note that we have to be careful, because the GNU coding standards
@@ -611,6 +609,11 @@ ifacedir           = $(libdir)
 #     (NOTE: configure script setting is ignored).
 libexecdir             = $(libdir)
 
+# This is a bit of a lie, as this is a wrapper rather than the program
+# itself. However, it means that we don't have to worry about Windows
+# and non-Windows having different extensions.
+GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace
+
 #-----------------------------------------------------------------------------
 # install configuration
 
@@ -667,8 +670,6 @@ SRC_HC_OPTS += -H16m -O
 # These flags make flex 8-bit
 SRC_FLEX_OPTS  += -8
 
-SRC_INSTALL_BIN_OPTS   += -s
-
 # lint gets all CPP's flags too
 SRC_LINT_OPTS          += -axz -DLINT $(SRC_CPP_OPTS)
 WAY$(_way)_LINT_OPTS   += WAY$(_way)_CPP_OPTS
@@ -1038,6 +1039,8 @@ STRIP                     = strip
 TAR                    = @TarCmd@
 ZIP                    = zip
 
+HSCOLOUR = @HSCOLOUR@
+
 #
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
@@ -1308,3 +1311,18 @@ WAY_o_HC_OPTS=
 
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 
+################################################################################
+#
+#    Bindist testing directory
+#
+################################################################################
+
+ifeq "$(Windows)" "YES"
+BIN_DIST_INST_SUBDIR = "install dir"
+else
+# I very much doubt that paths with spaces will work on Unix
+BIN_DIST_INST_SUBDIR = installed
+endif
+
+BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR)
+