X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=f18a1e742b1cb9ba94bd9f0c0ca04c23f2bc9d44;hb=b2f23f86c83dd1a2b63872146d61760c4a974242;hp=bed43c98a185a878f4ab7818a6339d3352e652e8;hpb=59e8e34e6232a939dff025905e90a3b2d8db7289;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index bed43c9..f18a1e7 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -215,11 +215,8 @@ endif
 # 	-O is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
 GhcLibHcOpts=-O
-else
-GhcLibHcOpts=-O -split-objs -odir $*
-endif
+SplitObjs = YES
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 #
@@ -560,6 +557,7 @@ CP			= cp
 CPP			= @CPP@
 CTAGS 			= $(ETAGS)
 RAWCPP                  = $(CPP) -undef -traditional
+FIND			= @FindCmd@
 INSTALL			= @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@ -632,10 +630,17 @@ YACC			= @YaccCmd@
 #-----------------------------------------------------------------------------
 # SGML stuff (currently not configured - we assume you have it)
 
-SGML2LATEX		= sgml2latex
-SGML2HTML		= sgml2html
-SGML2INFO		= sgml2info
-SGML2TXT		= sgml2txt
+SGML2DVI		= db2dvi
+SGML2HTML		= db2html
+SGML2INFO		= db2info
+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_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software
@@ -649,7 +654,6 @@ MSUB			= $(MSUB_PREFIX)msub
 ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
-SGML2LATEX		= sgml2latex
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 HAPPY_VERSION		= @HappyVersion@