X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=driver%2Fghci%2FMakefile;h=8a282af41686254331fe159a758691fab43c620f;hp=cdc4d4e519ace876fa61ad94b073d7207f869a5f;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hpb=6b6c06d3a95bcb08cf847e33e58aa2cdc32f0663

diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile
index cdc4d4e..8a282af 100644
--- a/driver/ghci/Makefile
+++ b/driver/ghci/Makefile
@@ -5,9 +5,6 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
-# hack for ghci-inplace script, see below
-INSTALLING=1
-
 # -----------------------------------------------------------------------------
 # ghci script
 
@@ -20,7 +17,7 @@ endif
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 INSTALL_PROGS    += $(C_PROG)
-GHCII_SCRIPT=$(bindir)/ghcii.sh
+GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh
 install::
 	$(RM) -f $(GHCII_SCRIPT)
 	echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
@@ -28,7 +25,7 @@ install::
 else
 LINK = ghci
 LINK_TARGET = $(LINK)-$(ProjectVersion)
-INSTALLED_SCRIPT=$(bindir)/$(LINK_TARGET)
+INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET)
 install::
 	$(RM) -f $(INSTALLED_SCRIPT)
 	echo "#!$(SHELL)"                                          >> $(INSTALLED_SCRIPT)
@@ -39,7 +36,8 @@ install::
 endif
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-INPLACE_SCRIPT=ghc-pkg-inplace
+INPLACE_SCRIPT=ghci-inplace
+CLEAN_FILES += $(INPLACE_SCRIPT)
 all::
 	$(RM) -f $(INPLACE_SCRIPT)
 	echo "#!$(SHELL)"                                                              >> $(INPLACE_SCRIPT)
@@ -49,16 +47,9 @@ all::
 	$(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
 endif
 
-# don't recurse on 'make install'
-#
-ifeq "$(INSTALLING)" "1"
-all clean distclean maintainer-clean ::
-	$(MAKE) INSTALLING=0 $(MFLAGS) $@
-endif
-
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 ghci.res : ghci.rc ghci.ico
-	windres -o ghci.res -i ghci.rc -O coff
+	windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o ghci.res -i ghci.rc -O coff
 endif
 
 binary-dist: