[project @ 2000-01-05 11:55:29 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f9bddb8..85fc4e2 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -147,7 +147,7 @@ IncludeTestDirsInBuild=NO
 #                           HC_ROJEMO_NHC
 #                           HC_UNSPECIFIED
 
-WithGhcHc = $(HC)
+WithGhcHc = @WithHc@
 
 # Variable which is set to the version number of the $(WithGhcHc) we're using.
 # Not currently used, but might come in handy sometime soon.
@@ -281,7 +281,7 @@ HaveLibReadline=@HaveLibReadline@
 ################################################################################
 
 # The compiler you'd like to use to compile Happy
-WithHappyHc = $(HC)
+WithHappyHc = @WithHc@
 
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
 #            to compile the Happy sources with.
@@ -312,6 +312,7 @@ HappyHcOpts = -O
 #
 ################################################################################
 
+WithNofibHc = $(GHC_INPLACE)
 
 # NoFibSubDirs controls which set of tests should be run
 # You can run one or more of
@@ -346,6 +347,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.
@@ -478,8 +484,6 @@ TEXI2HTML_PREFIX        = $(LITERATE_PREFIX)texi2html/
 HAPPY_PREFIX           = $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX       = $(FPTOOLS_TOP)/green-card/src/
 
-RTS_PREFIX             = $(FPTOOLS_TOP)/common-rts/
-
 UNLIT_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/unlit/
 UGEN_PREFIX             = $(FPTOOLS_TOP)/ghc/utils/ugen/
 STAT2RESID_PREFIX       = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
@@ -501,8 +505,14 @@ GHC                = @GHC@
 HBC            = @HBC@
 NHC            = @NHC@
 
-HC             = @WithHc@
-MKDEPENDHS     = $(GHC)
+HC             = @WithHc@
+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
+# tree).  We can refer to "this ghc" as $(GHC_INPLACE):
+
+GHC_INPLACE    = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
 
 #-----------------------------------------------------------------------------
 # C compiler
@@ -622,10 +632,10 @@ 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
 
 #-----------------------------------------------------------------------------
 #              FPtools support software
@@ -639,7 +649,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@                
@@ -710,6 +719,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,