Steve Kowalik has proposed merging lp:~stevenk/launchpad/makefile-shellisms into lp:launchpad.
Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~stevenk/launchpad/makefile-shellisms/+merge/82618 Fix shellisms in our Makefile related to $(RM). The long answer is that $(RM) expands to /bin/rm -f, so $(RM) -rf is pointless, $(RM) -r will work just as fine. -- https://code.launchpad.net/~stevenk/launchpad/makefile-shellisms/+merge/82618 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/makefile-shellisms into lp:launchpad.
=== modified file 'Makefile' --- Makefile 2011-11-11 07:02:32 +0000 +++ Makefile 2011-11-17 23:58:25 +0000 @@ -79,7 +79,7 @@ $(PY) ./utilities/make-dummy-hosted-branches $(API_INDEX): $(BZR_VERSION_INFO) $(PY) - rm -rf $(APIDOC_DIR) $(APIDOC_DIR).tmp + rm -r $(APIDOC_DIR) $(APIDOC_DIR).tmp mkdir -p $(APIDOC_DIR).tmp LPCONFIG=$(LPCONFIG) $(PY) ./utilities/create-lp-wadl-and-apidoc.py \ --force "$(APIDOC_TMPDIR)" @@ -376,13 +376,13 @@ -name '*.lo' -o -name '*.py[co]' -o -name '*.dll' \) \ -print0 | xargs -r0 $(RM) $(RM) -r lib/mailman - $(RM) -rf $(LP_BUILT_JS_ROOT)/* - $(RM) -rf $(CODEHOSTING_ROOT) - $(RM) -rf $(APIDOC_DIR) - $(RM) -rf $(APIDOC_DIR).tmp + $(RM) -r $(LP_BUILT_JS_ROOT)/* + $(RM) -r $(CODEHOSTING_ROOT) + $(RM) -r $(APIDOC_DIR) + $(RM) -r $(APIDOC_DIR).tmp $(RM) $(BZR_VERSION_INFO) $(RM) +config-overrides.zcml - $(RM) -rf \ + $(RM) -r \ /var/tmp/builddmaster \ /var/tmp/bzrsync \ /var/tmp/codehosting.test \ @@ -398,7 +398,7 @@ # /var/tmp/launchpad_mailqueue is created read-only on ec2test # instances. if [ -w /var/tmp/launchpad_mailqueue ]; then \ - $(RM) -rf /var/tmp/launchpad_mailqueue; \ + $(RM) -r /var/tmp/launchpad_mailqueue; \ fi
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
