X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fconfig.mk.in;h=a60d208f0d95b58009bad3039ce2f06b667fd24e;hb=3b24281ca45d2c8d2bf9e2e577b62fbf5580a626;hp=87bd4beeeb12cf5cd18dae9ec02091dd1ca761a0;hpb=5fd51ba140f65fad5c565797a86674991a2096d4;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 87bd4be..a60d208 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -146,7 +146,7 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 # 
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 2.10
+GhcProjectVersion      = 3.00
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -157,10 +157,6 @@ GhcProjectPatchLevel   = 0
 #
 #   WithGhcHc	   Path name of the compiler to use
 #
-#   Ghc2_0	   Whether this compiler is GHC 2.0 or later
-#		   (which affects gruesome details about
-# 		   how mutually recursive modules are handled)
-#
 #   WithGhcHcType  What "type" of compiler is being used
 #		   Valid options:
 #		       	     HC_CHALMERS_HBC
@@ -168,8 +164,7 @@ GhcProjectPatchLevel   = 0
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
 
-WithGhcHc = ghc-0.29
-Ghc2_0=NO
+WithGhcHc = ghc-2.10
 
 # Unused, we think
 # WithGhcHcType=HC_GLASGOW_GHC
@@ -676,10 +671,6 @@ HAPPY_VERSION		= @HappyVersion@
 LX			= @LxCmd@
 GREENCARD		= @GreencardCmd@
 
-ifeq "$(HAPPY)" ""
-HAPPY			= $(HAPPY_PREFIX)happy
-endif
-
 #
 # Stuff from fptools/literate
 #