[project @ 2002-07-24 06:27:01 by krasimir]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9fdc2a2..7cae94a 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -346,6 +346,10 @@ ReadlineIncludePath=
 # Math library
 LIBM=@LIBM@
 
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -490,6 +494,10 @@ libdir        = $(libdir0)
 datadir    = $(datadir0)
 endif
 
+# Default place for putting interface files is $(libdir)
+# (overriden for packages in package.mk)
+ifacedir   = $(libdir)
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular
@@ -599,10 +607,9 @@ LNDIR_PREFIX               = $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX       = $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX         = $(GLAFP_UTILS)/docbook/
 
-LITERATE_PREFIX        = $(FPTOOLS_TOP)/literate/
+HADDOCK_PREFIX         = $(FPTOOLS_TOP)/haddock/
 
-HAPPY_PREFIX           = $(FPTOOLS_TOP)/happy/src/
-GREENCARD_PREFIX       = $(FPTOOLS_TOP)/green-card/src/
+LITERATE_PREFIX        = $(FPTOOLS_TOP)/literate/
 
 UNLIT_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/unlit/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
@@ -662,6 +669,10 @@ endif
 # default C compiler flags
 SRC_CC_OPTS = @SRC_CC_OPTS@
 
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SRC_CC_OPTS += -G0
+endif
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -669,6 +680,11 @@ HaveLibGmp = @HaveLibGmp@
 LibGmp         = @LibGmp@
 
 #-----------------------------------------------------------------------------
+# Mingwex Library
+#
+HaveLibMingwEx = @HaveLibMingwEx@
+
+#-----------------------------------------------------------------------------
 # Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
@@ -846,6 +862,12 @@ HAPPY_VERSION              = @HappyVersion@
 GHC_HAPPY_OPTS         = -agc
 
 #
+# Haddock
+# 
+HADDOCK                        = @HaddockCmd@
+HADDOCK_INPLACE                = $(HADDOCK_PREFIX)/src/haddock-inplace
+
+#
 # Stuff from fptools/literate
 #
 LIT2PGM                = $(LITERATE_PREFIX)lit2pgm