summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:40 (GMT)
commit42a165c90fad01e2bc49579743bf58cb92534770 (patch)
treed64aa8aeececf65de49e1bef032f1339e033b5d1 /contrib/subtree
parent77d503757d6328703f9571a4432dd83800bc26bb (diff)
parent0df8e6d5a534f2e1d445dd6d5101fe1fd5f9bded (diff)
downloadgit-42a165c90fad01e2bc49579743bf58cb92534770.zip
git-42a165c90fad01e2bc49579743bf58cb92534770.tar.gz
git-42a165c90fad01e2bc49579743bf58cb92534770.tar.bz2
Merge branch 'ch/subtree-build'
Build update for "git subtree" (in contrib/) documentation pages. * ch/subtree-build: Revert "subtree: make install targets depend on build targets" subtree: make install targets depend on build targets subtree: add build targets 'man' and 'html'
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 5c6cc4a..6906aae 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -59,6 +59,10 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)
+man: $(GIT_SUBTREE_DOC)
+
+html: $(GIT_SUBTREE_HTML)
+
install: $(GIT_SUBTREE)
$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)