summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-11-05 16:23:00 +0000
committerIan Lynagh <igloo@earth.li>2009-11-05 16:23:00 +0000
commitf65bf7559b3e92607cfcf7a334e9994891dd9c32 (patch)
tree2e25a23c0baa60c14b8bf0a459732e3e1a36cc55 /driver
parent723eb70f31b2b413a51387bbbfbe01bb9b8c5907 (diff)
downloadhaskell-f65bf7559b3e92607cfcf7a334e9994891dd9c32.tar.gz
Make installation on *nix work for paths with spaces in their name
This means we can remove some conditional stuff from the Makefiles, and means the testsuite doesn't have to work out whether or not it's on Windows.
Diffstat (limited to 'driver')
-rw-r--r--driver/ghci/ghc.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index a80737bccd..eb4115f975 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -17,14 +17,14 @@ 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
+ $(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...