[project @ 1998-01-30 17:07:42 by simonm]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index eb93eb1..27c1ef3 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -87,7 +87,7 @@ HostVendor_CPP                        = @HostVendor_CPP@
 LeadingUnderscore=@LeadingUnderscore@
 
 # Pin a suffix on executables? If so, what. (cygwin32 only).
-exeext=
+exeext=@exeext@
 
 #################################################################################
 #
@@ -146,7 +146,7 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 # 
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 2.09
+GhcProjectVersion      = 3.00
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -157,10 +157,6 @@ GhcProjectPatchLevel   = 0
 #
 #   WithGhcHc     Path name of the compiler to use
 #
-#   Ghc2_0        Whether this compiler is GHC 2.0 or later
-#                 (which affects gruesome details about
-#                 how mutually recursive modules are handled)
-#
 #   WithGhcHcType  What "type" of compiler is being used
 #                 Valid options:
 #                           HC_CHALMERS_HBC
@@ -168,8 +164,7 @@ GhcProjectPatchLevel   = 0
 #                           HC_ROJEMO_NHC
 #                           HC_UNSPECIFIED
 
-WithGhcHc = ghc-0.29
-Ghc2_0=NO
+WithGhcHc = ghc-2.10
 
 # Unused, we think
 # WithGhcHcType=HC_GLASGOW_GHC
@@ -245,19 +240,24 @@ GhcLibWays=p
 #
 # ToDo: track down the source of this.
 #
-ifneq "$(strip $(way))" "p"
-GhcLibHcOpts= -O -split-objs -odir $*
-else
+ifeq "$(strip $(way))" "p"
 GhcLibHcOpts= -O
+else 
+ifeq "$(strip $(way))" "mr"
+GhcLibHcOpts= -O
+else
+GhcLibHcOpts= -O -split-objs -odir $*
+endif
 endif
 
 # what to include in a binary distribution
 
 GhcMainDir = ghc
 GhcBinDistDirs = ghc hslibs
-GhcBinDistDocs = docs ghc/docs/users_guide
+GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
 GhcBinDistPrlScripts = ghc stat2resid hstags mkdependHS
 GhcBinDistLibPrlScripts = hscpp
+GhcBinDistBins = hp2ps
 
 #################################################################################
 #
@@ -486,15 +486,14 @@ endif
 # override the various *_PREFIX in build.mk, i.e., having the following
 # in build.mk:
 #
-#   FASTMAKE_PREFIX=
+#   MKDEPENDC_PREFIX=
 #
-# will force `make' to rummage around in your PATH to find `fastmake' (not
+# will force `make' to rummage around in your PATH to find `mkdependC' (not
 # sure it would need it in the first place, but still).
 #
 GLAFP_UTILS            = $(FPTOOLS_TOP)/glafp-utils
 
 SCRIPT_PREFIX          = $(GLAFP_UTILS)/scripts/
-FASTMAKE_PREFIX                = $(GLAFP_UTILS)/fastmake/
 MKDEPENDC_PREFIX       = $(GLAFP_UTILS)/mkdependC/
 LTX_PREFIX             = $(GLAFP_UTILS)/ltx/
 RUNTEST_PREFIX         = $(GLAFP_UTILS)/runstdtest/
@@ -529,13 +528,6 @@ HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 HC             = $(FPTOOLS_TOP)/ghc/driver/ghc
 MKDEPENDHS     = $(HC)
 
-#
-# The compiler proper is built with the 1.2 compiler,
-# so when building the dependencies, we need mkdependHS
-# for the 1.2 compiler.
-#
-MKDEPENDHS_1_2  = mkdependHS-1.2
-
 #-----------------------------------------------------------------------------
 # C compiler
 #
@@ -648,6 +640,7 @@ YACC                        = @YaccCmd@
 
 SGML2LATEX             = sgml2latex
 SGML2HTML              = sgml2html
+SGML2INFO              = sgml2info
 SGML2TXT               = sgml2txt
 
 #-----------------------------------------------------------------------------
@@ -655,7 +648,6 @@ SGML2TXT            = sgml2txt
 
 # Stuff from fptools/glafp-utils
 MKDEPENDC              = $(MKDEPENDC_PREFIX)mkdependC
-FASTMAKE               = $(FASTMAKE_PREFIX)fastmake
 LTX                    = $(LTX_PREFIX)ltx
 MKDIRHIER              = $(MKDIRHIER_PREFIX)mkdirhier
 LNDIR                  = $(LNDIR_PREFIX)lndir
@@ -670,10 +662,6 @@ HAPPY_VERSION              = @HappyVersion@
 LX                     = @LxCmd@
 GREENCARD              = @GreencardCmd@
 
-ifeq "$(HAPPY)" ""
-HAPPY                  = $(HAPPY_PREFIX)happy
-endif
-
 #
 # Stuff from fptools/literate
 #