X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ea87badadd45604aa82eb2c19376d2fbb0f18e2e;hb=dbc5175b51bd894a47b2ef6d69b76c5eb660c294;hp=532be577ac7b5d760085f9a8358dd69a5c30b76f;hpb=3c4c46690784077c397163b934f3dcc6e4da7e27;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 532be57..ea87bad 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -106,7 +106,6 @@ exeext=@exeext@
 # projects use others you must list them in the correct order.
 #
 # Generally: 	* glafp-utils should be first
-#		* literate next
 #		* happy next
 #		* ghc next
 #		then it's up to you
@@ -129,6 +128,7 @@ Project		  = Ghc
 ProjectName       = $($(Project)ProjectName)
 ProjectNameShort  = $($(Project)ProjectNameShort)
 ProjectVersion    = $($(Project)ProjectVersion)
+ProjectVersionInt = $($(Project)ProjectVersionInt)
 ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 #################################################################################
@@ -143,9 +143,13 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 #
 # Name variables for ghc:
 # 
+# *ProjectVersion    is treated as a *string*
+# *ProjectVersionInt is treated as an *integer* (for cpp defines)
+
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 3.00
+GhcProjectVersion      = 3.02
+GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -285,6 +289,7 @@ GhcBinDistBins = hp2ps
 HappyProjectName       = Happy
 HappyProjectNameShort  = happy
 HappyProjectVersion    = 1.5
+HappyProjectVersionInt = 15
 HappyProjectPatchLevel = 0
 
 # The compiler you'd like to use to compile Happy
@@ -640,7 +645,7 @@ RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 HAPPY_VERSION		= @HappyVersion@		
 LX			= @LxCmd@
-GREENCARD		= @GreencardCmd@
+GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 
 #
 # Stuff from fptools/literate