[project @ 2000-04-17 11:39:56 by simonmar]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e21abe3..762aee8 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -215,15 +215,17 @@ 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
 
 # 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
+
 
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
@@ -347,6 +349,11 @@ NoFibHcOpts = -O
 #
 ################################################################################
 
+# Directory used by GHC (and possibly other tools) for storing
+# temporary files.  If your /tmp isn't big enough, either override
+# this in build.mk or set your environment variable "TMPDIR" to point
+# to somewhere with more space.  (TMPDIR=. is a good choice).
+
 TMPDIR                 = /tmp
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
@@ -501,7 +508,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
@@ -555,6 +562,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
@@ -627,10 +635,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
@@ -644,7 +659,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@                
@@ -715,6 +729,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,