Merge branch 'mt/send-email-cover-to-cc'

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index f3834b5bd6ebb91a611cf7a9f6ad8d8ccfe0cb58..d888d4516114c719e46ab7f2aeb24e63618b7fac 100644 (file)
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -12,7 +12,8 @@ man1dir ?= $(mandir)/man1
 -include ../../GIT-VERSION-FILE
 
 # this should be set to a 'standard' bsd-type install program
-INSTALL ?= install
+INSTALL  ?= install
+RM       ?= rm -f
 
 ASCIIDOC = asciidoc
 XMLTO    = xmlto
@@ -60,7 +61,7 @@ test:
        $(MAKE) -C t/ test
 
 clean:
-       rm -f *~ *.xml *.html *.1
-       rm -rf subproj mainline
+       $(RM) $(GIT_SUBTREE)
+       $(RM) *.xml *.html *.1
 
 .PHONY: FORCE