X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=0f7dc76fb63ceffe686dbc46d59ad4c99c872409;hb=22f40af747bb2d6b26b8755e539560db1c5814d1;hp=c52eeda5fbcfb51f468a101c328391e62343defb;hpb=727be8f2c13ef5841de7659d0d041740f1951fc2;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c52eeda..0f7dc76 100644
--- 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@
@@ -217,12 +217,13 @@ endif
 
 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"
 SplitObjs=NO
+else
+SplitObjs=YES
 endif
 
 
@@ -261,17 +262,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@
 
 ################################################################################
 #
@@ -636,14 +642,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)
 
 #-----------------------------------------------------------------------------