X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ad4bc041a93d1b7c2f8e18d21cc0908d481c10a7;hb=b64ab38c23af457a190ae3c8fed752f20fd21ae7;hp=24255d05fb54eb73f125d07a6dcc9f17d0a13c99;hpb=bd15be885462a30763c92a3613c630d8c0a3f0cc;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 24255d0..ad4bc04 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -51,11 +51,8 @@ BootingFromHc = @BootingFromHc@
 # rather than registerised code, i.e., disable the mangler?
 BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
-#
-# Which ways should DocBook XML documents be built?
-# options are: dvi ps pdf html chm HxS
-#
-XMLDocWays=
+NO_INCLUDE_DEPS = NO
+NO_INCLUDE_PKGDATA = NO
 
 # Should we build latex docs?
 LATEX_DOCS = NO
@@ -360,38 +357,6 @@ PapiIncludeDir=
 
 ################################################################################
 #
-#		nofib
-#
-# 	nofib specific options
-#
-################################################################################
-
-WithNofibHc = $(GHC_INPLACE)
-
-# NoFibSubDirs controls which set of tests should be run
-# You can run one or more of
-#	imaginary 
-#	spectral
-#	real
-#	parallel
-#	PRIVATE
-#	PENDING
-#	UNUSED
-NoFibSubDirs = imaginary spectral real
-
-# The different ways to build nofib. Default is just to mirror
-# what is done for the ghc prelude libraries.
-#
-NoFibWays = $(GhcLibWays)
-
-# Haskell compiler options for nofib
-NoFibHcOpts = -O
-
-# Number of times to run each program
-NoFibRuns = 5
-
-################################################################################
-#
 #		Paths (see paths.mk)
 #
 ################################################################################
@@ -921,12 +886,12 @@ ISCC                    =
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
 
+BUILD_DOCBOOK_HTML = @BUILD_DOCBOOK_HTML@
+BUILD_DOCBOOK_PS = @BUILD_DOCBOOK_PS@
+BUILD_DOCBOOK_PDF = @BUILD_DOCBOOK_PDF@
+DBLATEX		= @DblatexCmd@
 XSLTPROC		= @XsltprocCmd@
 XMLLINT			= @XmllintCmd@
-FOP			= @FopCmd@
-XMLTEX			= @XmltexCmd@
-PDFXMLTEX		= @PdfxmltexCmd@
-DVIPS			= @DvipsCmd@
 
 DIR_DOCBOOK_XSL		= @DIR_DOCBOOK_XSL@