Always quote arguments to removeFiles (fixes Windows install).
authorGeoffrey Mainland <gmainlan@microsoft.com>
Fri, 22 Feb 2013 15:26:55 +0000 (15:26 +0000)
committerGeoffrey Mainland <gmainlan@microsoft.com>
Fri, 22 Feb 2013 16:42:20 +0000 (16:42 +0000)
Thanks to Daniel Pratt <colorblinddad@gmail.com> for pointing out the failure
and fix.

driver/ghci/ghc.mk
ghc/ghc.mk

index 7220090..4b41849 100644 (file)
@@ -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)
index 554660e..5c37115 100644 (file)
@@ -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