X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=91344c12cda0d3ad1af16aaca2de65910fb7ed94;hp=5d339ad43b4f939a9f91e1384523c6eb92089ad3;hb=3797ee40aae273b23590c79b5f722cd763cab803;hpb=09a41d202bc87ed4bcde1ff3e99b8202986a3b74

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5d339ad..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@
@@ -662,6 +669,9 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 SRC_CC_OPTS += -G0
 endif
 
+# Solaris2 strikes again.
+unix_SRC_HSC2HS_OPTS += @unix_SRC_HSC2HS_OPTS@
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -830,7 +840,6 @@ VERBATIM		= $(VERBATIM_PREFIX)verbatim
 SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 LX			= @LxCmd@
-GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 
 BLD_DLL			= dllwrap
 
@@ -841,6 +850,17 @@ ILX2IL                  = ilx2il
 ILASM                   = ilasm
 
 #
+# ghc-pkg
+#
+GHC_PKG		        = @GhcPkgCmd@
+
+#
+# Greencard
+#
+GREENCARD	        = @GreencardCmd@
+GREENCARD_VERSION	= @GreencardVersion@		
+
+#
 # Happy
 #
 HAPPY			= @HappyCmd@