diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-07 22:37:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-07 22:37:17 (GMT) |
| commit | 4ccf2f506c56358e63699e080fd21c6e7e14f981 (patch) | |
| tree | 0b62a917b6472e0dded90ab5ef1f137251b65055 | |
| parent | 46992b5411508b3b1a77d3178440efa77774a367 (diff) | |
| parent | 95c62fb9ea35fab9706792e858ce66967501eb00 (diff) | |
| download | git-4ccf2f506c56358e63699e080fd21c6e7e14f981.zip git-4ccf2f506c56358e63699e080fd21c6e7e14f981.tar.gz git-4ccf2f506c56358e63699e080fd21c6e7e14f981.tar.bz2 | |
Merge branch 'jk/subtree-install-fix' into maint
We did not generate HTML version of documentation to "git subtree"
in contrib/.
* jk/subtree-install-fix:
subtree: add makefile target for html docs
| -rw-r--r-- | contrib/subtree/Makefile | 7 |
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 |