diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-11-19 01:29:05 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-11-19 01:52:32 +0000 |
| commit | 80e9070c77718b7ff0e913182e54842754726ce8 (patch) | |
| tree | 12804916372a3675a7d1beb00bd41e70083c5edf /rules/manual-package-config.mk | |
| parent | 042841713eb6468696eeb437de994c52eb7a858e (diff) | |
| download | haskell-80e9070c77718b7ff0e913182e54842754726ce8.tar.gz | |
Improve the way we call "rm" in the build system; fixes trac #4916
We avoid calling "rm -rf" with no file arguments; this fixes cleaning
on Solaris, where that fails.
We also check for suspicious arguments: anything containing "..",
starting "/", or containing a "*" (you need to call $(wildcard ...)
yourself now if you really want globbing). This should make things
a little safer.
Diffstat (limited to 'rules/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index c37f204d95..6f350dcac0 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -41,7 +41,7 @@ $1/package.conf.install: distclean : clean_$1_package.conf .PHONY: clean_$1_package.conf clean_$1_package.conf : - "$$(RM)" $$(RM_OPTS) $1/package.conf.install $1/package.conf.inplace + $$(call removeFiles,$1/package.conf.install $1/package.conf.inplace) $(call profEnd, manual-package-config($1)) endef |