X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fconfig.mk.in;h=c5d6adee2b1762d73899002c37b93fa33970b006;hb=6caa45bf8762fe38bb8d43a6181276f132f3c728;hp=552a27e62f432f0b65861970996954c9dc600e83;hpb=36cef1ea7f7e2dd68063598cdc23c4d1456f38ca;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 552a27e..c5d6ade 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -54,12 +54,6 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 NO_INCLUDE_DEPS = NO
 NO_INCLUDE_PKGDATA = NO
 
-#
-# Which ways should DocBook XML documents be built?
-# options are: dvi ps pdf html chm HxS
-#
-XMLDocWays=
-
 # Should we build latex docs?
 LATEX_DOCS = NO
 
@@ -586,7 +580,6 @@ GHC_MKDIRHIER_DIR       = $(GHC_UTILS_DIR)/mkdirhier
 GHC_DOCBOOK_DIR         = $(GHC_UTILS_DIR)/docbook
 GHC_UNLIT_DIR           = $(GHC_UTILS_DIR)/unlit
 GHC_HP2PS_DIR           = $(GHC_UTILS_DIR)/hp2ps
-GHC_HSTAGS_DIR          = $(GHC_UTILS_DIR)/hasktags
 GHC_GHCTAGS_DIR         = $(GHC_UTILS_DIR)/ghctags
 GHC_HSC2HS_DIR          = $(GHC_UTILS_DIR)/hsc2hs
 GHC_TOUCHY_DIR          = $(GHC_UTILS_DIR)/touchy
@@ -606,7 +599,6 @@ GHC_SYSMAN_DIR          = $(GHC_RTS_DIR)/parallel
 
 GHC_UNLIT_PGM           = unlit$(exeext)
 GHC_HP2PS_PGM           = hp2ps$(exeext)
-GHC_HSTAGS_PGM          = hasktags$(exeext)
 GHC_GHCTAGS_PGM         = ghctags$(exeext)
 GHC_HSC2HS_PGM          = hsc2hs$(exeext)
 GHC_TOUCHY_PGM          = touchy$(exeext)
@@ -632,7 +624,6 @@ GHC_PERL		= $(PERL)
 endif
 
 HP2PS			= $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM)
-HSTAGS			= $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
 MANGLER			= $(INPLACE_LIB)/$(GHC_MANGLER_PGM)
 SPLIT			= $(INPLACE_LIB)/$(GHC_SPLIT_PGM)
 SYSMAN 			= $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
@@ -945,6 +936,8 @@ ALEX_VERSION		= @AlexVersion@
 #
 SRC_ALEX_OPTS		= -g
 
+HSTAGS = @HstagsCmd@
+
 # Should we build haddock docs?
 HADDOCK_DOCS = YES
 # And HsColour the sources?