X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=37a7f412bb66090fb15660531fbfec09f36174cb;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=4ffb9154b7096573d8267e2b245c649fdfaddc37;hpb=812238d612a22ad86d8c823dcc1dec2af02e3350;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4ffb9154..37a7f41 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
 
 #
@@ -521,8 +528,6 @@ 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@
@@ -532,52 +537,31 @@ includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
+ifeq "$(Windows)" "YES"
+
 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))" ""
+# Hack: our directory layouts tend to be different on Windows, so
+# hack around configure's bogus assumptions here.
+datadir 	= $(prefix)
 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
+# Unix: override libdir and datadir to put project-specific stuff in
 # a subdirectory with the version number included.
 #
 libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
 datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
 
+endif # Windows
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
-ifacedir   = $(libdir)
+ifacedir		= $(libdir)
 
 # 
 # Default values for most of the above are only set if
@@ -616,8 +600,6 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-endif  # i386-unknown-mingw32
-
 
 ################################################################################
 #
@@ -713,6 +695,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@
@@ -752,11 +735,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