[project @ 2001-10-19 14:22:11 by simonpj]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index faf6cf3..9d2d908 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.191 2001/08/17 22:29:06 sof Exp $
+# $Id: Makefile,v 1.193 2001/10/19 10:02:50 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -18,8 +18,12 @@ WAYS=$(GhcCompilerWays)
 # equivalent of `env' if it doesn't exist locally).
 #
 ifneq "$(way)" "dll"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG=ghc$(_way)-$(ProjectVersion)
 else
+HS_PROG=ghc$(_way)
+endif
+else
 HS_PROG=ghc-$(ProjectVersion)
 endif
 
@@ -279,7 +283,7 @@ utils/PrimPacked_HC_OPTS    = -fvia-C -monly-3-regs
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
-ghci/ByteCodeLink_HC_OPTS      = -fvia-C
+ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
 
 # CSE interacts badly with top-level IORefs (reportedly in DriverState and
 # DriverMkDepend), causing some of them to be commoned up.  We have a fix for
@@ -400,7 +404,11 @@ CLEAN_FILES += ghc-inplace
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS += $(HS_PROG)
+endif
 
 #-----------------------------------------------------------------------------
 #              clean