[project @ 2002-06-20 16:00:18 by simonmar]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index d2a1267..f36f483 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -212,7 +212,7 @@ HaveRtldLocal = @HaveRtldLocal@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
+ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
 ifeq "$(HaveLibDL)" "YES"
 SRC_HC_OPTS += -ldl
@@ -292,6 +292,9 @@ endif
 ifeq "$(GhcUnregisterised)" "YES"
 SplitObjs=NO
 endif
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SplitObjs=NO
+endif
 
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
@@ -487,6 +490,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
@@ -596,10 +603,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/
@@ -659,6 +665,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)
 #
@@ -843,6 +853,11 @@ HAPPY_VERSION              = @HappyVersion@
 GHC_HAPPY_OPTS         = -agc
 
 #
+# Haddock
+# 
+HADDOCK_INPLACE                = $(HADDOCK_PREFIX)/src/haddock-inplace
+
+#
 # Stuff from fptools/literate
 #
 LIT2PGM                = $(LITERATE_PREFIX)lit2pgm