Merge branch 'sc/doc-howto-dumb-http' into maint

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05cdd5c9b2fe5210b9780d394b319ddf289a9eeb..4030a168986d29bdbb2cd982a2e819ce009580f6 100644 (file)
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -21,21 +21,24 @@ 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) -m 755 $(GIT_SUBTREE) $(libexecdir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)
+       $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
 
 install-doc: install-man
 
 install-man: $(GIT_SUBTREE_DOC)
-       $(INSTALL) -m 644 $^ $(man1dir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+       $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
 
 $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
        xmlto -m $(MANPAGE_NORMAL_XSL)  man $^
@@ -44,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