From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2018 06:43:39 +0000 (+0900)
Subject: Merge branch 'ch/subtree-build'
X-Git-Tag: v2.20.0-rc0~128
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/42a165c90fad01e2bc49579743bf58cb92534770?hp=77d503757d6328703f9571a4432dd83800bc26bb

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'
---

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 5c6cc4ab2c..6906aae441 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)