X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2Fghc.mk;h=31e84d6abbe9c78f39c25c1f6c2de7793f686a97;hb=b076da6047bf4c6b3d74a97c6c5fd59ed3bdd114;hp=9abccc368a9455f2404cb64a0bcfbead993de26f;hpb=4a5569ff37ae771560e56b564f3b15477b828a79;p=ghc-hetmet.git

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