[project @ 1998-12-03 15:24:08 by simonm]

merge from 4.01

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 9c55c3b..cd11165 100644 (file)
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -28,5 +28,6 @@ TOP:=$(GHC_TOP)
 
 -include $(TOP)/mk/paths.mk
 -include $(TOP)/mk/opts.mk
+-include $(TOP)/mk/version.mk
 include $(TOP)/mk/suffix.mk
 

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index e3b3a99..58331ad 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -37,7 +37,7 @@ endif
 
 GHC_DRIVER_DIR         = $(TOP)/driver
 GHC_COMPILER_DIR       = $(TOP)/compiler
-GHC_RUNTIME_DIR        = $(TOP)/runtime
+GHC_RUNTIME_DIR        = $(TOP)/rts
 GHC_LIB_DIR            = $(TOP)/lib
 GHC_INCLUDE_DIR        = $(TOP)/includes
 GHC_UTILS_DIR          = $(TOP)/utils
@@ -69,6 +69,3 @@ MKDEPENDHS_SRCS = $(HS_SRCS)
 else
 MKDEPENDHS_SRCS =
 endif
-
-# temporary until the new RTS is merged in.
-MOSTLY_CLEAN_FILES += *.hc

diff --git a/ghc/mk/suffix.mk b/ghc/mk/suffix.mk
index 08c3d4c..7c95850 100644 (file)
--- a/ghc/mk/suffix.mk
+++ b/ghc/mk/suffix.mk
@@ -1,6 +1,6 @@
 #################################################################################
 #
-#       $Id: suffix.mk,v 1.4 1998/08/14 12:27:45 sof Exp $
+#       $Id: suffix.mk,v 1.5 1998/12/03 15:24:08 simonm Exp $
 #
 #              GHC-specific suffix rules
 #

diff --git a/ghc/mk/version.mk b/ghc/mk/version.mk
index 8b467a7..85cb9b1 100644 (file)
--- a/ghc/mk/version.mk
+++ b/ghc/mk/version.mk
@@ -21,8 +21,8 @@
 
 ProjectName       = The Glorious Glasgow Haskell Compilation System
 ProjectNameShort  = ghc
-ProjectVersion    = 3.03
-ProjectVersionInt = 303
+ProjectVersion    = 4.01
+ProjectVersionInt = 401
 ProjectPatchLevel = 0
 
 #
@@ -35,7 +35,15 @@ ProjectPatchLevel = 0
 # version - one (semi-valid) reason for having them separate is that
 # object files produced by different versions of the compiler need
 # not be incompatible..
-HscMajorVersion=33
+HscMajorVersion=40
 HscMinorVersion=0
 CcMajorVersion=36
 CcMinorVersion=1
+
+#
+# Interface file version
+#
+# If you should happen to make changes to the interface file format
+# that will break compatibility with older versions, up this variable.
+# 
+HscIfaceFileVersion=5