X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2Fghc.mk;h=57ae1b28ed7eb5625f6075a2c64144184a510a5f;hb=2b8358cfe8b6399874090c099e3b96e932c6ccbb;hp=4e6cc7b83216d6f77d131cb3d25c794f4d0581da;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 4e6cc7b..57ae1b2 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -17,17 +17,19 @@ install: install_driver_ghci
 .PHONY: install_driver_ghci
 install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion)
 install_driver_ghci:
-	"$(MKDIRHIER)" $(DESTDIR)$(bindir)
-	"$(RM)" $(RM_OPTS)                                 $(WRAPPER)
-	echo '#!$(SHELL)'                               >> $(WRAPPER)
-	echo 'exec $(bindir)/ghc-$(ProjectVersion) --interactive ${1+"$@"}' >> $(WRAPPER)
-	$(EXECUTABLE_FILE)                                 $(WRAPPER)
-	"$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghci
-	$(LN_S) ghci-$(ProjectVersion) $(DESTDIR)$(bindir)/ghci
+	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+	"$(RM)" $(RM_OPTS)                                 "$(WRAPPER)"
+	$(CREATE_SCRIPT)                                   "$(WRAPPER)"
+	echo '#!$(SHELL)'                               >> "$(WRAPPER)"
+	echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive $${1+"$$@"}' >> "$(WRAPPER)"
+	$(EXECUTABLE_FILE)                                 "$(WRAPPER)"
+	"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghci"
+	$(LN_S) ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghci"
 
 else # Windows...
 
-driver/ghci_dist_C_SRCS  = ghci.c
+driver/ghci_dist_C_SRCS  = ghci.c ../utils/cwrapper.c ../utils/getLocation.c
+driver/ghci_dist_CC_OPTS += -I driver/utils
 driver/ghci_dist_PROG    = ghci$(exeext)
 driver/ghci_dist_INSTALL = YES
 driver/ghci_dist_OTHER_OBJS = driver/ghci/ghci.res
@@ -39,7 +41,7 @@ driver/ghci_dist_PROG_VER = ghci-$(ProjectVersion)$(exeext)
 INSTALL_BINS += driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG_VER)
 
 driver/ghci/ghci.res : driver/ghci/ghci.rc driver/ghci/ghci.ico
-	windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o driver/ghci/ghci.res -i driver/ghci/ghci.rc -O coff
+	$(INPLACE_MINGW)/bin/windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o driver/ghci/ghci.res -i driver/ghci/ghci.rc -O coff
 
 driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG_VER) : driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG)
 	"$(CP)" $< $@
@@ -50,7 +52,7 @@ install : install_driver_ghcii
 install_driver_ghcii: GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh
 install_driver_ghcii: GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(ProjectVersion).sh
 install_driver_ghcii:
-	"$(MKDIRHIER)" $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	"$(RM)" $(RM_OPTS) $(GHCII_SCRIPT)
 	echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
 	echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT)