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 3c0b312..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
@@ -714,6 +712,7 @@ GHC_DOCBOOK_DIR_REL = $(GHC_UTILS_DIR_REL)/docbook
 GHC_UNLIT_DIR_REL      = $(GHC_UTILS_DIR_REL)/unlit
 GHC_HP2PS_DIR_REL      = $(GHC_UTILS_DIR_REL)/hp2ps
 GHC_HSTAGS_DIR_REL     = $(GHC_UTILS_DIR_REL)/hasktags
+GHC_GHCTAGS_DIR_REL    = $(GHC_UTILS_DIR_REL)/ghctags
 GHC_HSC2HS_DIR_REL     = $(GHC_UTILS_DIR_REL)/hsc2hs
 GHC_TOUCHY_DIR_REL     = $(GHC_UTILS_DIR_REL)/touchy
 GHC_PKG_DIR_REL                = $(GHC_UTILS_DIR_REL)/ghc-pkg
@@ -741,6 +740,7 @@ GHC_DOCBOOK_DIR             = $(FPTOOLS_TOP)/$(GHC_DOCBOOK_DIR_REL)
 GHC_UNLIT_DIR          = $(FPTOOLS_TOP)/$(GHC_UNLIT_DIR_REL)
 GHC_HP2PS_DIR          = $(FPTOOLS_TOP)/$(GHC_HP2PS_DIR_REL)
 GHC_HSTAGS_DIR         = $(FPTOOLS_TOP)/$(GHC_HSTAGS_DIR_REL)
+GHC_GHCTAGS_DIR                = $(FPTOOLS_TOP)/$(GHC_GHCTAGS_DIR_REL)
 GHC_HSC2HS_DIR         = $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL)
 GHC_TOUCHY_DIR         = $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL)
 GHC_PKG_DIR            = $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL)
@@ -768,6 +768,7 @@ GHC_DOCBOOK_DIR_ABS = $(FPTOOLS_TOP_ABS)/$(GHC_DOCBOOK_DIR_REL)
 GHC_UNLIT_DIR          = $(FPTOOLS_TOP_ABS)/$(GHC_UNLIT_DIR_REL)
 GHC_HP2PS_DIR_ABS      = $(FPTOOLS_TOP_ABS)/$(GHC_HP2PS_DIR_REL)
 GHC_HSTAGS_DIR_ABS     = $(FPTOOLS_TOP_ABS)/$(GHC_HSTAGS_DIR_REL)
+GHC_GHCTAGS_DIR_ABS    = $(FPTOOLS_TOP_ABS)/$(GHC_GHCTAGS_DIR_REL)
 GHC_HSC2HS_DIR_ABS     = $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)
 GHC_TOUCHY_DIR_ABS     = $(FPTOOLS_TOP_ABS)/$(GHC_TOUCHY_DIR_REL)
 GHC_PKG_DIR_ABS                = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)
@@ -787,6 +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_INPLACE_PGM        = ghctags-inplace
 GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace
 GHC_TOUCHY_PGM         = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
@@ -812,6 +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_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/.