X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2Fghc.mk;h=eb4115f975f232ce74a569d2eff04935d9700af8;hb=69ba3e6bbae81ce02f6ea66d0686667b7dfb7e8f;hp=dd3f213af3f6cd3c02e6d4256d449ce9427c3d32;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index dd3f213..eb4115f 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -17,13 +17,14 @@ install: install_driver_ghci
 .PHONY: install_driver_ghci
 install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion)
 install_driver_ghci:
-	$(MKDIRHIER) $(DESTDIR)$(bindir)
-	$(RM) -f                                           $(WRAPPER)
-	echo '#!$(SHELL)'                               >> $(WRAPPER)
-	echo 'exec $(bindir)/ghc-$(ProjectVersion) --interactive ${1+"$@"}' >> $(WRAPPER)
-	$(EXECUTABLE_FILE)                                 $(WRAPPER)
-	$(RM) -f $(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...
 
@@ -42,7 +43,7 @@ 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
 
 driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG_VER) : driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG)
-	$(CP) $< $@
+	"$(CP)" $< $@
 
 install : install_driver_ghcii
 
@@ -50,8 +51,8 @@ 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)
-	$(RM) -f $(GHCII_SCRIPT)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	"$(RM)" $(RM_OPTS) $(GHCII_SCRIPT)
 	echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
 	echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT)
 	$(EXECUTABLE_FILE) $(GHCII_SCRIPT)