diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-08 11:57:45 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-08 11:57:45 +0000 |
| commit | 630cff0df4289e44404428ec679777cd422273bb (patch) | |
| tree | a8a73df02811d7f51fb4578833ffc40bbeb724bd /rules | |
| parent | 2007d2138cf17efe6a1701510dbafdfc30e8926c (diff) | |
| download | haskell-630cff0df4289e44404428ec679777cd422273bb.tar.gz | |
Tidy up the "rm" flags in the build system
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package.mk | 2 | ||||
| -rw-r--r-- | rules/clean-target.mk | 2 | ||||
| -rw-r--r-- | rules/docbook.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk index 9d1629d49a..b4763b682f 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -46,7 +46,7 @@ maintainer-clean : distclean .PHONY: clean_$1_$2_config clean_$1_$2_config: "$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h - "$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache + "$$(RM)" $$(RM_OPTS_REC) $1/autom4te.cache ifneq "$$($1_$2_NOT_NEEDED)" "YES" $$(eval $$(call build-package-helper,$1,$2,$3)) diff --git a/rules/clean-target.mk b/rules/clean-target.mk index cf7c671e0b..5da31fa881 100644 --- a/rules/clean-target.mk +++ b/rules/clean-target.mk @@ -17,5 +17,5 @@ clean : clean_$1 clean_$1 : clean_$1_$2 .PHONY: clean_$1_$2 clean_$1_$2: - "$$(RM)" $$(RM_OPTS) -r $3 + "$$(RM)" $$(RM_OPTS_REC) $3 endef diff --git a/rules/docbook.mk b/rules/docbook.mk index 080874d86a..cec0f2c449 100644 --- a/rules/docbook.mk +++ b/rules/docbook.mk @@ -33,7 +33,7 @@ html_$1 : $1/$2/index.html ifneq "$$(BINDIST)" "YES" $1/$2/index.html: $$($1_DOCBOOK_SOURCES) - "$$(RM)" $$(RM_OPTS) -r $$(dir $$@) + "$$(RM)" $$(RM_OPTS_REC) $$(dir $$@) "$$(XSLTPROC)" --stringparam base.dir $$(dir $$@) \ --stringparam use.id.as.filename 1 \ --stringparam html.stylesheet fptools.css \ |