diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-30 22:00:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-30 22:00:21 +0000 |
| commit | 0ef6ba7b28187a4bf5309f9702eeaf53a281204b (patch) | |
| tree | 653c84d5647c6efa71836dbd7a7231b2ae725988 /driver | |
| parent | d5629b335a3254612887be8091b76dbdf2b582f8 (diff) | |
| download | haskell-0ef6ba7b28187a4bf5309f9702eeaf53a281204b.tar.gz | |
Quote commands that we run, so they work if there are space in their paths
I've also added some missing $s to some makefiles. These aren't
technically necessary, but it's nice to be consistent.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/ghci/ghc.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index dd3f213af3..4e6cc7b832 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -17,12 +17,12 @@ 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) + "$(MKDIRHIER)" $(DESTDIR)$(bindir) + "$(RM)" $(RM_OPTS) $(WRAPPER) echo '#!$(SHELL)' >> $(WRAPPER) echo 'exec $(bindir)/ghc-$(ProjectVersion) --interactive ${1+"$@"}' >> $(WRAPPER) $(EXECUTABLE_FILE) $(WRAPPER) - $(RM) -f $(DESTDIR)$(bindir)/ghci + "$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghci $(LN_S) ghci-$(ProjectVersion) $(DESTDIR)$(bindir)/ghci else # Windows... @@ -42,7 +42,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 +50,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) + "$(MKDIRHIER)" $(DESTDIR)$(bindir) + "$(RM)" $(RM_OPTS) $(GHCII_SCRIPT) echo "#!$(SHELL)" >> $(GHCII_SCRIPT) echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT) $(EXECUTABLE_FILE) $(GHCII_SCRIPT) |