X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=cb57b0b4247ed2c10592c51c30c2a0f3986958c6;hb=8db5c9818937c1f952e4cdd58451ea6b25975441;hp=f616629d4a457e531af1bfd9026199175e7dad2c;hpb=7fd0e6b9ae44d9e4fdcc8183608bdae80d39d849;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f616629..cb57b0b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -506,7 +506,7 @@ HBC		= @HBC@
 NHC		= @NHC@
 
 HC	        = @WithHc@
-MKDEPENDHS	= $(GHC)
+MKDEPENDHS	= $(HC)
 
 # Sometimes we want to invoke ghc from the build tree in different
 # projects (eg. it's handy to have a nofib & a ghc build in the same
@@ -632,10 +632,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 +656,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@		
@@ -720,6 +726,7 @@ HSTAGS			= $(HSTAGS_PREFIX)hstags
 # The ways currently defined.
 #
 ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
+USER_WAYS=a b c d e f g h i j k l m n o A B
 
 #
 # The following ways currently have treated specially, p u t mg,