[commit: ghc] master: Always quote arguments to removeFiles (fixes Windows install). (1a3247f)

Geoffrey Mainland gmainlan at microsoft.com
Fri Feb 22 17:44:35 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1a3247f6a5d98c15139e8650c88a61284a786731

>---------------------------------------------------------------

commit 1a3247f6a5d98c15139e8650c88a61284a786731
Author: Geoffrey Mainland <gmainlan at microsoft.com>
Date:   Fri Feb 22 15:26:55 2013 +0000

    Always quote arguments to removeFiles (fixes Windows install).
    
    Thanks to Daniel Pratt <colorblinddad at gmail.com> for pointing out the failure
    and fix.

>---------------------------------------------------------------

 driver/ghci/ghc.mk |    2 +-
 ghc/ghc.mk         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 7220090..4b41849 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 554660e..5c37115 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
 





More information about the ghc-commits mailing list