X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2Fghc.mk;h=50512cc195c5aff036a2556aa0cc1a06b5e1f6dc;hb=7828bf3ea2ea34e7a3a8662f5f621ef706ffee5c;hp=88c084d442a01b425a96a4d27025262313314e91;hpb=479829c435d1b19ac8e132dce40fd42ab63654f9;p=ghc-hetmet.git

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 88c084d..50512cc 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
@@ -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)