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>
James Denholm committed
May 6, 2014 at 22:41 UTC
602efc4f90295369763cc58b47c3c6532a070fe9
1 file changed
+4
-3
contrib/subtree/Makefile
+4
-3
@@ -12,7 +12,8 @@ man1dir ?= $(mandir)/man1
12
-include ../../GIT-VERSION-FILE
13
14
# this should be set to a 'standard' bsd-type install program
15
-INSTALL ?= install
15
+INSTALL ?= install
16
+RM ?= rm -f
17
18
ASCIIDOC = asciidoc
19
XMLTO = xmlto
@@ -60,7 +61,7 @@ test:
61
$(MAKE) -C t/ test
62
63
clean:
63
- rm -f *~ *.xml *.html *.1
64
- rm -rf subproj mainline
64
+ $(RM) $(GIT_SUBTREE)
65
+ $(RM) *.xml *.html *.1
66
67
.PHONY: FORCE