[project @ 2001-10-12 14:28:08 by rrt]

Update "make install" settings for Windows.

diff --git a/ghc/driver/ghci/Makefile b/ghc/driver/ghci/Makefile
index 0774cf4..c0d9fc8 100644 (file)
--- a/ghc/driver/ghci/Makefile
+++ b/ghc/driver/ghci/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 2001/08/03 17:03:48 sof Exp $
+# $Id: Makefile,v 1.9 2001/10/12 14:28:08 rrt Exp $
 #
 
 TOP=../..
@@ -36,7 +36,11 @@ endif
 SCRIPT_OBJS      = ghci.sh
 INTERP           = $(SHELL)
 SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
+else
+INSTALL_PROGS    += $(C_PROG)
+endif
 TOPDIROPT        = -B$(GHCLIB)
 
 ifeq "$(INSTALLING)" "1"

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 3a61af1..b7840c2 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 2001/08/21 14:38:04 sewardj Exp $
+# $Id: Makefile,v 1.12 2001/10/12 14:28:46 rrt Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -14,11 +14,13 @@ HS_PROG           = ghc-pkg.bin
 SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
                    -package util -package text
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS    += $(HS_PROG)
 SRC_HC_OPTS      += -package win32
 endif
 
-INSTALL_LIBEXECS = $(HS_PROG)
 
 # -----------------------------------------------------------------------------
 # ghc-pkg script
@@ -42,7 +44,9 @@ INPLACE_SCRIPT_PROG    = ghc-pkg-inplace
 SCRIPT_OBJS      = ghc-pkg.sh
 INTERP           = $(SHELL)
 SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
+endif
 PKGCONFOPT       = -f $(PKGCONF)
 
 ifeq "$(INSTALLING)" "1"

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 93a4b55..228864b 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.22 2001/09/12 11:16:05 rrt Exp $
+# $Id: Makefile,v 1.23 2001/10/12 14:29:11 rrt Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -55,8 +55,12 @@ SCRIPT_SUBST_VARS = HSC2HS_BINDIR HSC2HS_DIR HS_PROG HSC2HS_EXTRA
 SCRIPT_OBJS=hsc2hs.sh
 INTERP=$(SHELL)
 
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS    += $(HS_PROG)
+endif
 
 override datadir=$(libdir)
 INSTALL_DATAS += template-hsc.h