X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=c569159a9dfeb4e0e38f42fc82c6321dee6a4f90;hb=d62e0e3b935e0a8172cf7e96c9df0d445f4afb9a;hp=eaefe4a56efa77339c5cd1f38b040bef6d96d956;hpb=bc9c5514385a440ecb944a9f624f944005037083;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index eaefe4a..c569159 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -611,11 +611,6 @@ 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
 
@@ -641,6 +636,19 @@ INSTALL_HEADER  = $(INSTALL) -m 644
 INSTALL_MAN     = $(INSTALL) -m 644
 INSTALL_DIR     = $(MKDIRHIER)
 
+#
+# runhaskell and hsc2hs are special, in that other compilers besides
+# GHC might provide them.  Systems with a package manager often come
+# with tools to manage this kind of clash, e.g. RPM's
+# update-alternatives.  When building a distribution for such a system,
+# we recommend setting both of the following to 'YES'.
+#
+# NO_INSTALL_RUNHASKELL = YES
+# NO_INSTALL_HSC2HS     = YES
+#
+# NB. we use negative tests here because for binary-distributions we cannot
+# test build-time variables at install-time, so they must default to on.
+
 # -----------------------------------------------------------------------------
 # Utilities programs: flags 
 
@@ -701,6 +709,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
@@ -728,6 +737,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)
@@ -755,6 +765,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)
@@ -774,6 +785,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_HSC2HS_INPLACE_PGM	= hsc2hs-inplace
 GHC_TOUCHY_PGM		= touchy$(exeext)
 GHC_MANGLER_PGM		= ghc-asm
@@ -799,6 +811,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)
 HSC2HS_INPLACE		= $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM)
 MANGLER			= $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
 SPLIT			= $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)