X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2Fghc.mk;h=31e84d6abbe9c78f39c25c1f6c2de7793f686a97;hb=57e2a81c589103b50da80a9e378b1a11285bd521;hp=50512cc195c5aff036a2556aa0cc1a06b5e1f6dc;hpb=f97d36cd6e050a251ef421c902bcfa04200dcfd1;p=ghc-hetmet.git

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 50512cc..31e84d6 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -17,7 +17,7 @@ install: install_driver_ghci
 .PHONY: install_driver_ghci
 install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion)
 install_driver_ghci:
-	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+	$(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
 	"$(RM)" $(RM_OPTS)                                 "$(WRAPPER)"
 	$(CREATE_SCRIPT)                                   "$(WRAPPER)"
 	echo '#!$(SHELL)'                               >> "$(WRAPPER)"
@@ -41,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)" $< $@
@@ -52,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:
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(call INSTALL_DIR,$(DESTDIR)$(bindir))
 	"$(RM)" $(RM_OPTS) $(GHCII_SCRIPT)
 	echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
 	echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT)