X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=d1605d1c2b5854950fe5b71a84dad19cf4c1076f;hp=67875e1eda346ecc1ff1547ef3af55a4063b2322;hb=8b7e4e09174a407fb4e9f6e8f2e105c9d272b214;hpb=e4e7b37c7ed6b2cd39c34c30f7dcf9369a562496

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 67875e1..d1605d1 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -257,7 +257,9 @@ GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
 
-ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc)))
+# ArchSupportsSMP should be set iff there is support for that arch in
+# includes/SMP.h
+ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc powerpc)))
 
 ifeq "$(ArchSupportsSMP)$(GhcUnregisterised)" "YESNO"
 GhcWithSMP=YES
@@ -313,6 +315,9 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
+# Building with debugger?
+GhciWithDebugger=YES
+
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -503,6 +508,7 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 # passing through, we might as well set them.
 
 prefix			= @prefix@
+datarootdir		= @datarootdir@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir0		= @datadir@
@@ -595,6 +601,7 @@ INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_SCRIPT  = $(INSTALL) -m 755
 INSTALL_SHLIB   = $(INSTALL) -m 755
 INSTALL_DATA    = $(INSTALL) -m 644
+INSTALL_MAN     = $(INSTALL) -m 644
 INSTALL_DIR     = $(MKDIRHIER)
 
 # -----------------------------------------------------------------------------
@@ -826,11 +833,11 @@ GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
 # Some useful GHC version predicates:
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
-ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
-ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
-ghc_ge_605 = $(shell if (test $(GhcCanonVersion) -ge 605); then echo YES; else echo NO; fi)
+ghc_ge_504 = @ghc_ge_504@
+ghc_ge_601 = @ghc_ge_601@
+ghc_ge_602 = @ghc_ge_602@
+ghc_ge_603 = @ghc_ge_603@
+ghc_ge_605 = @ghc_ge_605@
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version
@@ -875,6 +882,9 @@ endif
 HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
+GMP_INCLUDE_DIRS=@GMP_INCLUDE_DIRS@
+GMP_LIB_DIRS=@GMP_LIB_DIRS@
+
 #-----------------------------------------------------------------------------
 # GMP framework (Mac OS X)
 #