From 3797ee40aae273b23590c79b5f722cd763cab803 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Fri, 23 May 2003 08:49:22 +0000
Subject: [PATCH] [project @ 2003-05-23 08:49:22 by simonmar] Make hackery to
 give $(GhcCanonVersion) the right value even when we have a
 single-digit $(GhcMinVersion).

---
 mk/config.mk.in |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 575782c..91344c1 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -619,8 +619,15 @@ GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 GhcPatchLevel	= @GhcPatchLevel@
-# Canonicalised ghc version number, used for easy (integer) version comparisons.
+
+# Canonicalised ghc version number, used for easy (integer) version
+# comparisons.  We must expand $(GhcMinVersion) to two digits by
+# adding a leading zero if necessary:
+ifneq "$(findstring $(GhcMinVersion), 0 1 2 3 4 5 6 7 8 9)" ""
+GhcCanonVersion = $(GhcMajVersion)0$(GhcMinVersion)
+else
 GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
+endif
 
 HBC		= @HBC@
 NHC		= @NHC@
-- 
1.7.10.4