X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=6068821b2e476610c0f87e72ea764481cefac91b;hb=db53a2568a9c7cccaa3e3fcfde7d40762a259199;hp=538c1bac89485c2436351f5a3890218436f816bb;hpb=6b630fcbbb3cefef8daf025a81d66bc09a976784;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 538c1ba..6068821 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -128,6 +128,7 @@ Project		  = Ghc
 ProjectName       = $($(Project)ProjectName)
 ProjectNameShort  = $($(Project)ProjectNameShort)
 ProjectVersion    = $($(Project)ProjectVersion)
+ProjectVersionInt = $($(Project)ProjectVersionInt)
 ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 #################################################################################
@@ -142,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.01
+GhcProjectVersion      = 3.02
+GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -244,7 +249,12 @@ else
 ifeq "$(strip $(way))" "mr"
 GhcLibHcOpts= -O
 else
+ifeq "$(GhcWithHscBuiltViaC)" "NO"
 GhcLibHcOpts= -O -split-objs -odir $*
+else
+#NB: .hc files need to distributed in *unsplit* form.
+GhcLibHcOpts= -O
+endif
 endif
 endif
 
@@ -284,6 +294,7 @@ GhcBinDistBins = hp2ps
 HappyProjectName       = Happy
 HappyProjectNameShort  = happy
 HappyProjectVersion    = 1.5
+HappyProjectVersionInt = 15
 HappyProjectPatchLevel = 0
 
 # The compiler you'd like to use to compile Happy
@@ -493,6 +504,8 @@ TEXI2HTML_PREFIX        = $(LITERATE_PREFIX)texi2html/
 HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
 
+RTS_PREFIX		= $(FPTOOLS_TOP)/common-rts/
+
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
 UGEN_PREFIX             = $(FPTOOLS_TOP)/ghc/utils/ugen/
 STAT2RESID_PREFIX       = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
@@ -542,7 +555,7 @@ COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
-CPP			= @RAWCPP@
+CPP			= @CPP@
 CTAGS 			= $(ETAGS)
 RAWCPP                  = @RAWCPP@
 GNUCPP                  = @GNUCPP@
@@ -639,7 +652,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