MERGED: If we have hscolour then make source code links in teh haddock docs

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c569159..706bf7c 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
 
@@ -785,7 +788,7 @@ GHC_SPLIT_DIR_ABS   = $(FPTOOLS_TOP_ABS)/$(GHC_SPLIT_DIR_REL)
 GHC_UNLIT_PGM          = unlit$(exeext)
 GHC_HP2PS_PGM          = hp2ps
 GHC_HSTAGS_PGM         = hasktags
-GHC_GHCTAGS_PGM                = ghctags
+GHC_GHCTAGS_INPLACE_PGM        = ghctags-inplace
 GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace
 GHC_TOUCHY_PGM         = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
@@ -811,7 +814,7 @@ endif
 UNLIT                  = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
 HP2PS                  = $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM)
 HSTAGS                 = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
-GHCTAGS                        = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_PGM)
+GHCTAGS_INPLACE                = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_INPLACE_PGM)
 HSC2HS_INPLACE         = $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM)
 MANGLER                        = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
 SPLIT                  = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
@@ -1038,6 +1041,8 @@ STRIP                     = strip
 TAR                    = @TarCmd@
 ZIP                    = zip
 
+HSCOLOUR = @HSCOLOUR@
+
 #
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.