X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7e00d1852d1701a36a1d922fd525aa1ded4a45af;hb=c140c1415a91991c617f8ba153b54e6e69cf9640;hp=f019ab6deb7f67cdd8a99d6eb7c0123c4752fce2;hpb=d5febf91342eba207d872ac3979f7537d95ea797;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f019ab6..7e00d18 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -357,11 +357,7 @@ endif
 GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_p thr_debug,)
 
 # We can only build GHCi threaded if we have a threaded RTS:
-ifneq "$(findstring thr, $(GhcRTSWays))" ""
-GhcThreaded=YES
-else
-GhcThreaded=NO
-endif
+GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 
 # Option flags to pass to GHC when it's compiling modules in
 # fptools/libraries.  Typically these are things like -O or
@@ -501,38 +497,43 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= /C/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
+# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
+# On Windows this is a c:/foo/bar style path.
 FPTOOLS_TOP_ABS		= @hardtop@
-# The platform specific version of 'hardtop'.
-FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
 # This gets used in the default docdir
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
 BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
-BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
+BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP)
+BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
+BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
+BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
+
+BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
+
 
 #
 # Installation directories, we don't use half of these,
 # but since the configure script has them on offer while
 # passing through, we might as well set them.
 
-prefix			= @prefix@
+prefix          := @prefix@
 
 # New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag.
 # However, in order to support older autoconf's we don't use it.
 # datarootdir is set lower down instead.
-# datarootdir		= @datarootdir@
-
-exec_prefix		= @exec_prefix@
-bindir			= @bindir@
-datadir0		= @datadir@
-libdir0			= @libdir@
-includedir		= @includedir@
-oldincludedir		= @oldincludedir@
-mandir			= @mandir@
+# But, as datadir is defined in terms of datarootdir, we also need to
+# set it to the value (if any) that configure gives it here.
+datarootdir     := @datarootdir@
+
+exec_prefix     := @exec_prefix@
+bindir          := @bindir@
+datadir0        := @datadir@
+libdir0         := @libdir@
+includedir      := @includedir@
+oldincludedir   := @oldincludedir@
+mandir          := @mandir@
 
 ifeq "$(Windows)" "YES"
 
@@ -542,9 +543,9 @@ endif
 
 # Hack: our directory layouts tend to be different on Windows, so
 # hack around configure's bogus assumptions here.
-datarootdir = $(prefix)
-datadir 	= $(prefix)
-libdir		= $(prefix)
+datarootdir := $(prefix)
+datadir     := $(prefix)
+libdir      := $(prefix)
 
 else
 
@@ -552,28 +553,28 @@ else
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
 #
-datarootdir = $(datadir0)
-datadir     = $(datadir0)/ghc-$(ProjectVersion)
-libdir      = $(libdir0)/ghc-$(ProjectVersion)
+datarootdir := $(datadir0)
+datadir     := $(datadir0)/ghc-$(ProjectVersion)
+libdir      := $(libdir0)/ghc-$(ProjectVersion)
 
 endif # Windows
 
-headerdir = $(libdir)/include
+headerdir := $(libdir)/include
 
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.
 
-#docdir    = @docdir@
-#htmldir   = @htmldir@
-#dvidir    = @dvidir@
-#pdfdir    = @pdfdir@
-#psdir     = @psdir@
+#docdir    := @docdir@
+#htmldir   := @htmldir@
+#dvidir    := @dvidir@
+#pdfdir    := @pdfdir@
+#psdir     := @psdir@
 
-docdir    = $(datarootdir)/doc/ghc
-htmldir   = $(docdir)
-dvidir    = $(docdir)
-pdfdir    = $(docdir)
-psdir     = $(docdir)
+docdir    := $(datarootdir)/doc/ghc
+htmldir   := $(docdir)
+dvidir    := $(docdir)
+pdfdir    := $(docdir)
+psdir     := $(docdir)
 
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
@@ -616,6 +617,11 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
+# This is a bit of a lie, as this is a wrapper rather than the program
+# itself. However, it means that we don't have to worry about Windows
+# and non-Windows having different extensions.
+GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace
+
 #-----------------------------------------------------------------------------
 # install configuration