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/manual-package-config.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/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 298fe47d48..da5cacffaf 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -14,20 +14,20 @@ define manual-package-config # args: $1 = dir $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE) - $(CPP) $(RAWCPP_FLAGS) -P \ + $$(CPP) $$(RAWCPP_FLAGS) -P \ -DTOP='"$$(TOP)"' \ $$($1_PACKAGE_CPP_OPTS) \ -x c -I$$(GHC_INCLUDE_DIR) $$< | \ grep -v '^#pragma GCC' | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$$@ - $(GHC_PKG_INPLACE) update --force $$@ + "$$(GHC_PKG_INPLACE)" update --force $$@ # This is actually a real file, but we need to recreate it on every # "make install", so we declare it as phony .PHONY: $1/package.conf.install $1/package.conf.install: - $(CPP) $(RAWCPP_FLAGS) -P \ + $$(CPP) $$(RAWCPP_FLAGS) -P \ -DINSTALLING \ -DLIB_DIR='"$$(libdir)"' \ -DINCLUDE_DIR='"$$(libdir)/include"' \ @@ -39,6 +39,6 @@ $1/package.conf.install: distclean : clean_$1_package.conf .PHONY: clean_$1_package.conf clean_$1_package.conf : - $(RM) $1/package.conf.install $1/package.conf.inplace + "$$(RM)" $$(RM_OPTS) $1/package.conf.install $1/package.conf.inplace endef |