diff options
| author | Jeff King <peff@peff.net> | 2014-08-17 03:07:32 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-18 10:20:36 -0700 |
| commit | 960160b061a29a4a4ae637e035c3892da72326ac (patch) | |
| tree | 9db37d02eae61caa1896e7f9a4bf9b5675dc47f4 /contrib/subtree | |
| parent | da33a97998f6d6206c08bd72a527f5b8e6e26d33 (diff) | |
| download | git-960160b061a29a4a4ae637e035c3892da72326ac.tar.gz | |
subtree: make "all" default target of Makefilejk/contrib-subtree-make-all
You should be able to run "make" in contrib/subtree with no
arguments and get the "all" target. This was broken by 8e2a5cc
(contrib/subtree/Makefile: use GIT-VERSION-FILE, 2014-05-06), which
put the rule for GIT-VERSION-FILE higher in the file.
We can fix this by putting an empty "all::" target at the top of the
file, just like our main Makefile does, and document that fact.
That fixes this instance and future-proofs against it happening
again.
Reported-by: Jack Nagel <jacknagel@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
| -rw-r--r-- | contrib/subtree/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index d9a0ce2c63..c2bd703ee3 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -1,3 +1,6 @@ +# The default target of this Makefile is... +all:: + -include ../../config.mak.autogen -include ../../config.mak @@ -34,7 +37,7 @@ GIT_SUBTREE_XML := git-subtree.xml GIT_SUBTREE_TXT := git-subtree.txt GIT_SUBTREE_HTML := git-subtree.html -all: $(GIT_SUBTREE) +all:: $(GIT_SUBTREE) $(GIT_SUBTREE): $(GIT_SUBTREE_SH) sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' $< >$@ |