Make installation on *nix work for paths with spaces in their name

[ghc-hetmet.git] / driver / ghci / ghc.mk

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 4e6cc7b..eb4115f 100644 (file)
--- 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)" $(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...
 
@@ -50,7 +51,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)