summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-04 22:58:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-04 22:58:08 (GMT)
commit59c21d17890476550755ff16636208fd3c9d0fd9 (patch)
tree3a6831811d48e2514094baa9f37e2a93045aa728 /contrib/subtree
parentec787db662af05eb6b7dcd71bed1548055cf437a (diff)
parent95c62fb9ea35fab9706792e858ce66967501eb00 (diff)
downloadgit-59c21d17890476550755ff16636208fd3c9d0fd9.zip
git-59c21d17890476550755ff16636208fd3c9d0fd9.tar.gz
git-59c21d17890476550755ff16636208fd3c9d0fd9.tar.bz2
Merge branch 'jk/subtree-install-fix'
* jk/subtree-install-fix: subtree: add makefile target for html docs
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 435b2de..4030a16 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -21,13 +21,14 @@ GIT_SUBTREE := git-subtree
GIT_SUBTREE_DOC := git-subtree.1
GIT_SUBTREE_XML := git-subtree.xml
GIT_SUBTREE_TXT := git-subtree.txt
+GIT_SUBTREE_HTML := git-subtree.html
all: $(GIT_SUBTREE)
$(GIT_SUBTREE): $(GIT_SUBTREE_SH)
cp $< $@ && chmod +x $@
-doc: $(GIT_SUBTREE_DOC)
+doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)
install: $(GIT_SUBTREE)
$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)
@@ -46,6 +47,10 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
-agit_version=$(gitver) $^
+$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
+ asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
+ -agit_version=$(gitver) $^
+
test:
$(MAKE) -C t/ test