X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ff0c349bbc42ece39556dd4aa28add0a35ab25bd;hb=cc33dd28f9931d01ff378e428eb5f38d25541a06;hp=8daeff4468c323f84cbe67eb4dea2206d8285ab7;hpb=1f2151278691540edde18843cdf7ce23697889ba;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8daeff4..ff0c349 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -124,6 +124,13 @@ LeadingUnderscore=@LeadingUnderscore@
 # Pin a suffix on executables? If so, what (Windows only).
 exeext=@exeext@
 
+# Windows=YES if on a Windows platform
+ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" ""
+Windows=YES
+else
+Windows=NO
+endif
+
 ################################################################################
 #
 #		project-wide flags
@@ -145,9 +152,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 # Build the libs first if we're bootstrapping from .hc files.
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib docs
 else
-AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib docs
 endif
 
 #
@@ -364,11 +371,6 @@ GhcRtsCcOpts=-fomit-frame-pointer
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
-# DEPRECATED:
-# This option is no longer used.  We now always build the threaded RTS,
-# add the flag '-threaded' to GHC to get it.
-GhcRtsThreaded=@ThreadedRts@
-
 ################################################################################
 #
 # libraries project
@@ -411,6 +413,7 @@ GLUT_LIBS=@GLUT_LIBS@
 
 # X11 stuff
 #
+GhcLibsWithX11=@GhcLibsWithX11@
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
@@ -525,21 +528,52 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 # but since the configure script has them on offer while
 # passing through, we might as well set them.
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir0		= @datadir@
-
-#sysconfdir		= @datadir@
-#sharedstatedir		= @sharedstatedir@
-#localstatedir		= @localstatedir@
 libdir0			= @libdir@
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
-#UNUSED:infodir		= @infodir@
-#UNUSED:srcdir          = @srcdir@
+ifeq "$(strip $(prefix))" ""
+prefix		= c:/ghc
+endif
+
+ifacedir   = $(libdir)
+
+ifeq "$(strip $(exec_prefix))" ""
+exec_prefix		= $(prefix)
+endif
+ifeq "$(strip $(bindir))" ""
+bindir			= $(exec_prefix)/bin
+endif
+
+libexecdir		= $(libdir)
+
+ifeq "$(strip $(datadir))" ""
+datadir		= $(prefix)/imports
+endif
+ifeq "$(strip $(libdir))" ""
+libdir		= $(prefix)
+endif
+ifeq "$(strip $(includedir))" ""
+includedir	= $(prefix)/include
+endif
+
+else
+
+prefix			= @prefix@
+exec_prefix		= @exec_prefix@
+bindir			= @bindir@
+datadir0		= @datadir@
+libdir0			= @libdir@
+includedir		= @includedir@
+oldincludedir		= @oldincludedir@
+mandir			= @mandir@
 
 #
 # override libdir and datadir to put project-specific stuff in
@@ -589,6 +623,9 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
+endif  # i386-unknown-mingw32
+
+
 ################################################################################
 #
 #		Utilities programs: flags
@@ -683,6 +720,7 @@ HSC2HS_PREFIX		= $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
 # (because the version numbers have to be calculated).
 
 GHC		= @WithGhc@
+GhcDir          = $(dir $(GHC))
 GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
@@ -722,11 +760,13 @@ GHC_STAGE3 	= $(FPTOOLS_TOP)/ghc/compiler/stage3/ghc-inplace
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
 WhatGccIsCalled = @WhatGccIsCalled@
+GccVersion      = @GccVersion@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC	= cc
 else
   CC	= $(WhatGccIsCalled)
+  GccDir = $(dir $(WhatGccIsCalled))
 endif
 endif