diff options
| author | Geoffrey Mainland <gmainlan@microsoft.com> | 2013-02-22 15:26:55 +0000 |
|---|---|---|
| committer | Geoffrey Mainland <gmainlan@microsoft.com> | 2013-02-22 16:42:20 +0000 |
| commit | 1a3247f6a5d98c15139e8650c88a61284a786731 (patch) | |
| tree | 4b6c90660736f30fe27f3b2c0cf53c52adf803d7 | |
| parent | 96ce0b026eb95ae19a9d4a7df2601f299576f84a (diff) | |
| download | haskell-1a3247f6a5d98c15139e8650c88a61284a786731.tar.gz | |
Always quote arguments to removeFiles (fixes Windows install).
Thanks to Daniel Pratt <colorblinddad@gmail.com> for pointing out the failure
and fix.
| -rw-r--r-- | driver/ghci/ghc.mk | 2 | ||||
| -rw-r--r-- | ghc/ghc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index 7220090696..4b41849a21 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -54,7 +54,7 @@ install_driver_ghcii: GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh install_driver_ghcii: GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(ProjectVersion).sh install_driver_ghcii: $(call INSTALL_DIR,$(DESTDIR)$(bindir)) - $(call removeFiles,$(GHCII_SCRIPT)) + $(call removeFiles,"$(GHCII_SCRIPT)") echo "#!$(SHELL)" >> $(GHCII_SCRIPT) echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT) $(EXECUTABLE_FILE) $(GHCII_SCRIPT) diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 554660e812..5c37115886 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -177,7 +177,7 @@ else install: install_ghc_post .PHONY: install_ghc_post install_ghc_post: install_bins - $(call removeFiles,$(DESTDIR)$(bindir)/ghc.exe) + $(call removeFiles,"$(DESTDIR)$(bindir)/ghc.exe") "$(MV)" -f $(DESTDIR)$(bindir)/ghc-stage$(INSTALL_GHC_STAGE).exe $(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc.exe endif |