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 /rules/shell-wrapper.mk | |
| 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 'rules/shell-wrapper.mk')
| -rw-r--r-- | rules/shell-wrapper.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 742390b029..acdb06e72d 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -16,7 +16,7 @@ define shell-wrapper ifeq "$$($1_$2_SHELL_WRAPPER)" "YES" -ifeq "$(Windows)" "YES" +ifeq "$$(Windows)" "YES" ifeq "$$($1_$2_INSTALL_SHELL_WRAPPER)" "YES" # Just install the binary on Windows @@ -33,11 +33,11 @@ ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG) $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) - $$(RM) -f $$@ + "$$(RM)" $$(RM_OPTS) $$@ echo '#!$$(SHELL)' >> $$@ - echo 'executablename=$$(TOP)/$$<' >> $$@ - echo 'datadir=$$(TOP)/$$(INPLACE_LIB)' >> $$@ - echo 'bindir=$$(TOP)/$$(INPLACE_BIN)' >> $$@ + echo 'executablename=$$(TOP)/$$<' >> $$@ + echo 'datadir=$$(TOP)/$$(INPLACE_LIB)' >> $$@ + echo 'bindir=$$(TOP)/$$(INPLACE_BIN)' >> $$@ cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@ $$(EXECUTABLE_FILE) $$@ endif @@ -57,8 +57,8 @@ install: install_$1_$2_wrapper .PHONY: install_$1_$2_wrapper install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$$($1_$2_INSTALL_SHELL_WRAPPER_NAME) install_$1_$2_wrapper: - $$(MKDIRHIER) $$(DESTDIR)$$(bindir) - $$(RM) -f $$(WRAPPER) + "$$(MKDIRHIER)" $$(DESTDIR)$$(bindir) + "$$(RM)" $$(RM_OPTS) $$(WRAPPER) echo '#!$$(SHELL)' >> $$(WRAPPER) echo 'executablename=$$(libexecdir)/$$($1_$2_PROG)' >> $$(WRAPPER) echo 'datadir=$$(datadir)' >> $$(WRAPPER) |