summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJames Denholm <nod.helm@gmail.com>2014-05-06 12:41:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-06 22:36:17 (GMT)
commit602efc4f90295369763cc58b47c3c6532a070fe9 (patch)
tree5d6d51a4e7720908293e33decc079798f501b8c0 /contrib/subtree
parentc7abbb986387470512080b162574c99cd7991aa7 (diff)
downloadgit-602efc4f90295369763cc58b47c3c6532a070fe9.zip
git-602efc4f90295369763cc58b47c3c6532a070fe9.tar.gz
git-602efc4f90295369763cc58b47c3c6532a070fe9.tar.bz2
contrib/subtree/Makefile: clean up rule for "clean"
git:Documentation/Makefile and others establish "RM ?= rm -f" as a convention for rm calls in clean rules, hence follow this convention instead of simply forcing clean to use rm. subproj and mainline no longer need to be removed in clean, as they are no longer created in git:contrib/subtree by "make test". Hence, remove the rm call for those folders. Other makefiles don't remove "*~" files, remove the rm call to prevent unexpected behaviour in the future. Similarly, clean doesn't remove the installable file, so rectify this. Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: James Denholm <nod.helm@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index f3834b5..d888d45 100644
--- 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