X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=71aa5149be25e2e623e87c7da9c95ddf399ec33d;hb=c1c1e720a1e42df940c932f789f74bd5bcff4882;hp=66732d8d0e74a0fd1bc6e0d545966ef8784e2769;hpb=56aacf9222c1c8f1d7aa6079bf5eb9c0a8bab7f7;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 66732d8..71aa514 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -145,9 +145,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
 
 #
@@ -288,8 +288,8 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
-#   debug_thr   : debugging threaded
-#   debug_thr_p : debugging threaded profiled
+#   thr_debug   : debugging threaded
+#   thr_debug_p : debugging threaded profiled
 #
 ifeq "$(BootingFromHc)" "YES"
 GhcRTSWays=
@@ -356,32 +356,14 @@ endif
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
 
-# This is a good way to set things like -optc-g and -optc-DDEBUG for the RTS.
-# GhcRtsHcOpts is used when compiling .hc files and .c files.
-# GhcRtsCcOpts is used when compiling .c  files only.
-
-# For a debugging RTS:
-# GhcRtsHcOpts = -optc-DDEBUG
-# GhcRtsCcOpts = -g
-
-# For an optimised RTS:
+# For an optimised RTS (you probably don't want to change these; we build
+# a debugging RTS by default now.  Use -package rts_debug to get it).
 GhcRtsHcOpts=-O2
 GhcRtsCcOpts=-fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
-#
-# To have the RTS support interoperation with OS threads, set
-# GhcRtsThreaded to YES (preferably via the --enable-threaded-rts
-# configure script option). The consequence of this is spelled out
-# in details elsewhere, but, briefly, Concurrent Haskell threads
-# can now make external (i.e., C) calls without blocking the progress
-# of other CH threads. Multiple native threads can also execute
-# Haskell code without getting in each others way too.
-# 
-GhcRtsThreaded=@ThreadedRts@
-
 ################################################################################
 #
 # libraries project
@@ -424,6 +406,7 @@ GLUT_LIBS=@GLUT_LIBS@
 
 # X11 stuff
 #
+GhcLibsWithX11=@GhcLibsWithX11@
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
@@ -538,21 +521,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
@@ -602,6 +616,9 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
+endif  # i386-unknown-mingw32
+
+
 ################################################################################
 #
 #		Utilities programs: flags
@@ -696,6 +713,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@
@@ -735,11 +753,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
 
@@ -1075,6 +1095,14 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
+# Way 'thr_debug':
+WAY_thr_debug_NAME=threaded
+WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
+
+# Way 'thr_debug_p':
+WAY_thr_debug_p_NAME=threaded
+WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof
+
 #
 # Add user-way configurations here:
 #