[project @ 2000-05-09 12:34:29 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 762aee8..45824f7 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -168,7 +168,7 @@ GhcCompilerWays=
 #
 #      -dcore-lint     check the types after every pass of the compiler;
 #                      a pretty strong internal check
-GhcHcOpts=
+GhcHcOpts=-O
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
 GhcWithHscBuiltViaC=@BootingFromHc@
@@ -209,6 +209,7 @@ GhcLibWays=p
 endif
 
 # Option flags to pass to GHC when it's compiling prelude modules
+# *and* standard library modules (std) *and* modules in hslibs
 # Typically these are things like -O or -dcore-lint
 # The ones that are *essential* are wired into ghc/lib/Makefile
 #
@@ -220,7 +221,7 @@ GhcLibHcOpts=-O
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 # Don't split object files for libs if we're building DLLs
 EnableWin32DLLs=@EnableWin32DLLs@
-ifeq "($EnableWin32DLLs)" "YES"
+ifeq "$(EnableWin32DLLs)" "YES"
 SplitObjs=NO
 else
 SplitObjs=YES
@@ -262,17 +263,22 @@ GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 HsLibsFor      = ghc
 
 # hslibs for GHC also uses the following variables (defined above):
-#   GhcLibWays, GhcLibHcOpts, EnableWin32DLLs, StripLibraries
+#   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries
+
+# Haskell compiler options for tools in hslibs
+GhcLibToolsHcOpts=-O
 
 # Build the Haskell Readline bindings?
 #
-GhcLibsWithReadline=NO
-#
+GhcLibsWithReadline=@HaveReadlineHeaders@
+
+# Libraries needed for linking with readline
+LibsReadline=@LibsReadline@
+
 # Include path to readline.h
 # (no path == in standard include path)
 #
 ReadlineIncludePath=
-HaveLibReadline=@HaveLibReadline@
 
 ################################################################################
 #
@@ -637,14 +643,14 @@ YACC                      = @YaccCmd@
 
 SGML2DVI               = db2dvi
 SGML2HTML              = db2html
-SGML2INFO              = db2info
+SGML2PS                        = db2ps
 SGML2RTF               = db2rtf
 
 SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
 
 SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
-SRC_SGML2INFO_OPTS      = -d $(SGMLSTYLESHEET)
+SRC_SGML2PS_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
 #-----------------------------------------------------------------------------