X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=068add51a800f902beea135d70f4b98ec925d7e3;hb=c1572a8968e1a0fac2c70e0172d5f304d560b2f3;hp=e5522f50c671af699a6010d3cce7482c2dd796c6;hpb=5c1039224e8595ed2acd6518316a1075f5a6b78a;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e5522f5..068add5 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -185,6 +185,12 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 XMLDocWays=
 
+# Should we build haddock docs?
+HADDOCK_DOCS = YES
+
+# Should we build latex docs?
+LATEX_DOCS = NO
+
 # Mac OS X deployment target (to cross-compile for older OS versions)
 #
 MACOSX_DEPLOYMENT_VERSION = @MACOSX_DEPLOYMENT_VERSION@
@@ -943,8 +949,8 @@ GhcMinVersion	= @GhcMinVersion@
 # when $(HC) does *not* point to one of the GHC binaries built in
 # the local tree.
 #
-BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(HC)),,-package-conf $(BOOTSTRAPPING_CONF))
-BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF))
+BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring inplace, $(HC)),,-package-conf $(BOOTSTRAPPING_CONF))
+BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring inplace, $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF))
 
 # Some useful GHC version predicates:
 ghc_ge_605 = @ghc_ge_605@