X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=638791b656fab4fb633ca1d2e99d312f1661e656;hb=124690e9ad1111c4e73ba63b9d991fd014c8f645;hp=8a306debc65d9da97961234ad9e1d97946bf98d4;hpb=488cfa009d4410fb3fda1232c787ef4289ac0296;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8a306de..638791b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -436,13 +436,8 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= C:/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-
-ifeq "$(findstring $(TARGETPLATFORM), i386-unknown-cygwin32 i386-unknown-mingw32)" ""
-FPTOOLS_TOP_ABS		= @hardtop@
-else
-FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
-endif
+# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (platform-specific format).
+FPTOOLS_TOP_ABS		= @hardtop_plat@
 # Keep the Unix-style path to use with Unix tools (e.g. in ghc-inplace script)
 FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 
@@ -619,6 +614,8 @@ GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 GhcPatchLevel	= @GhcPatchLevel@
+# Canonicalised ghc version number, used for easy (integer) version comparisons.
+GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 
 HBC		= @HBC@
 NHC		= @NHC@
@@ -833,7 +830,7 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= $(shell if ( test `echo $(HAPPY_VERSION) | sed -e "s/\(.*\)\..*/\1/g"` "-gt" "1" || test `echo $(HAPPY_VERSION) | sed -e "s/.*\.\(.*\)/\1/g"` "-ge" "9" ); then echo -agc; else echo -g; fi)
+GHC_HAPPY_OPTS		= @HappyOpts@
 
 #
 # Stuff from fptools/literate