X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=9034773f0fd153bc2f3cf27e0a3445e081487d9a;hb=6bfb3fcdbe0ee6080cb86a72518de1fd5646d610;hp=b1b54f31ee47efdbe33090b435c8b5c806c058bb;hpb=cd759f053d3f54fe62e1b5f3f74ec5c8f4c10893;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b1b54f3..9034773 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@
@@ -241,6 +247,7 @@ GhcStage3HcOpts=-O2
 
 GhcProfiled=NO
 GhcDebugged=NO
+GhcLibProfiled=NO
 
 # Build shared and/or static libs?
 BuildSharedLibs=@BuildSharedLibs@
@@ -531,7 +538,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= /C/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
+# FPTOOLS_TOP_ABS: the top of the fptools hierarchy, absolute path.
 # On Windows this is a c:/foo/bar style path.
 FPTOOLS_TOP_ABS		= @hardtop@
 
@@ -610,9 +617,14 @@ else
 
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
+#
+# datadir is set to libdir here as GHC needs package.conf and unlit
+# to be in the same place (and things like ghc-pkg need to agree on
+# where package.conf is, so we just set it globally).
+#
 datarootdir := $(datadir0)
-datadir     := $(datadir0)/ghc-$(ProjectVersion)
 libdir      := $(libdir0)/ghc-$(ProjectVersion)
+datadir     := $(libdir)
 
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.
@@ -1180,11 +1192,6 @@ ALEX_VERSION		= @AlexVersion@
 GHC_ALEX_OPTS		= -g
 
 #
-# Haddock
-# 
-HADDOCK			= @HaddockCmd@
-
-#
 # Options for compiling in different `ways'. 
 # 
 # To configure up your own way, have a look at some of the standard ways