summaryrefslogtreecommitdiff
path: root/ghc/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-05-30 22:00:21 +0000
committerIan Lynagh <igloo@earth.li>2009-05-30 22:00:21 +0000
commit0ef6ba7b28187a4bf5309f9702eeaf53a281204b (patch)
tree653c84d5647c6efa71836dbd7a7231b2ae725988 /ghc/ghc.mk
parentd5629b335a3254612887be8091b76dbdf2b582f8 (diff)
downloadhaskell-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 'ghc/ghc.mk')
-rw-r--r--ghc/ghc.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 1115946c4e..8f2c74155e 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -117,7 +117,7 @@ all_ghc_stage2 : $(GHC_STAGE2)
all_ghc_stage3 : $(GHC_STAGE3)
$(INPLACE_LIB)/extra-gcc-opts : extra-gcc-opts
- $(CP) $< $@
+ "$(CP)" $< $@
# The GHC programs need to depend on all the helper programs they might call
ifeq "$(GhcUnregisterised)" "NO"
@@ -149,15 +149,15 @@ ifeq "$(Windows)" "NO"
install: install_ghc_link
.PNONY: install_ghc_link
install_ghc_link:
- $(RM) -f $(DESTDIR)$(bindir)/ghc
- $(LN_S) ghc-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc
+ "$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc
+ "$(LN_S)" ghc-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc
else
# On Windows we install the main binary as $(bindir)/ghc.exe
# To get ghc-<version>.exe we have a little C program in driver/ghc
install: install_ghc_post
.PHONY: install_ghc_post
install_ghc_post: install_bins
- $(RM) -f $(DESTDIR)$(bindir)/ghc.exe
- $(MV) -f $(DESTDIR)$(bindir)/ghc-stage$(INSTALL_GHC_STAGE).exe $(DESTDIR)$(bindir)/ghc.exe
+ "$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc.exe
+ "$(MV)" -f $(DESTDIR)$(bindir)/ghc-stage$(INSTALL_GHC_STAGE).exe $(DESTDIR)$(bindir)/ghc.exe
endif