[project @ 2001-10-23 14:35:12 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a4f4e2a..1717d7a 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -128,6 +128,11 @@ ProjectsDontInstall = glafp-utils nofib
 #
 IncludeTestDirsInBuild=NO
 
+#
+# Which ways should SGML documents be built?
+#
+SGMLDocWays=
+
 ################################################################################
 #
 #              GHC project
@@ -206,7 +211,7 @@ HaveLibDL = @HaveLibDL@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd osf3)" ""
+ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
 ifeq "$(HaveLibDL)" "YES"
 SRC_HC_OPTS += -ldl
@@ -676,7 +681,7 @@ COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF           = @ContextDiffCmd@
 CP                     = cp
-CPP                    = @CPP@
+CPP                    = @CPP@ @CPPFLAGS@
 CTAGS                  = $(ETAGS)
 #
 # RAWCPP_FLAGS are the flags to give to cpp (viz, gcc -E) to persuade it to
@@ -694,6 +699,7 @@ INSTALL                     := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX                  = latex
 HEVEA                  = hevea
 HACHA                  = hacha
+LD                     = ld
 LN_S                   = @LN_S@
 MANMACROS              = -man
 MSMACROS               = -ms