[project @ 2001-11-09 21:25:56 by sof]

GhcCanonVersion: leave out GhcPatchLevel, causes problems when
the GhcPatchLevel isn't a patchlevel but a date.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 739b7c2..8006fc7 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.201 2001/11/09 18:17:48 sof Exp $
+# $Id: Makefile,v 1.202 2001/11/09 21:25:56 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -113,9 +113,9 @@ ifeq "$(BootingFromHc)" "YES"
 bootstrapped = YES
 compiling_with_4xx=NO
 else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi)
-compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 5000); then echo YES; else echo NO; fi)
-ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 5020); then echo YES; else echo NO; fi)
+bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)); then echo YES; else echo NO; fi)
+compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
+ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 445ad74..cd2a720 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -26,7 +26,7 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)"            \
 
 SRC_HC_OPTS += -fglasgow-exts -cpp 
 
-ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 4070); then echo YES; else echo NO; fi)
+ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 407); then echo YES; else echo NO; fi)
 
 ifeq "$(ghc_407_at_least)" "YES"
 SRC_HC_OPTS += -package concurrent -package text

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4ab6e35..638791b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -615,7 +615,7 @@ GhcMajVersion       = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 GhcPatchLevel  = @GhcPatchLevel@
 # Canonicalised ghc version number, used for easy (integer) version comparisons.
-GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)$(GhcPatchLevel)
+GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 
 HBC            = @HBC@
 NHC            = @NHC@