[project @ 2001-11-09 21:25:56 by sof]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 02435e8..638791b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -208,6 +208,9 @@ else
 GhcWithNativeCodeGen=NO
 endif
 
+# Include support for generating Java
+GhcWithJavaGen=NO
+
 HaveLibDL = @HaveLibDL@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
@@ -433,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@
 
@@ -451,15 +449,15 @@ FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 prefix                 = @prefix@
 exec_prefix            = @exec_prefix@
 bindir                 = @bindir@
-datadir                        = @datadir@
+datadir0               = @datadir@
 
 #sysconfdir            = @datadir@
 #sharedstatedir                = @sharedstatedir@
 #localstatedir         = @localstatedir@
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-libdir                 = @libdir@
+libdir0                        = @libdir@
 else
-libdir                  = @prefix@
+libdir0                 = @prefix@
 endif
 includedir             = @includedir@
 oldincludedir          = @oldincludedir@
@@ -473,8 +471,11 @@ mandir                     = @mandir@
 # a subdirectory with the version number included.
 #
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-libdir     := $(if $(ProjectNameShort),$(libdir)/$(ProjectNameShort)-$(ProjectVersion),$(libdir))
-datadir    := $(if $(ProjectNameShort),$(datadir)/$(ProjectNameShort)-$(ProjectVersion),$(datadir))
+libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
+datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
+else
+libdir    = $(libdir0)
+datadir    = $(datadir0)
 endif
 
 # 
@@ -613,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@
@@ -827,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