subtree: add an install-html target

Also adjust ignore rules accordingly.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3d7f0ad2d589dfe0365d4456d56853e7c0..0b9381abcad34e79a1cdfa129bb9b3e4e187a62e 100644 (file)
--- a/contrib/subtree/.gitignore
+++ b/contrib/subtree/.gitignore
@@ -1,6 +1,7 @@
 *~
 git-subtree
 *~
 git-subtree

-git-subtree.xml

 git-subtree.1
 git-subtree.1

+git-subtree.html
+git-subtree.xml

 mainline
 subproj
 mainline
 subproj

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index c2bd703ee3aa0fd734c71dc50c01085455d33773..3071baf493442e8bfb3f34252f9c0d13801343b1 100644 (file)
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -5,9 +5,10 @@ all::
 -include ../../config.mak
 
 prefix ?= /usr/local
 -include ../../config.mak
 
 prefix ?= /usr/local

-mandir ?= $(prefix)/share/man

 gitexecdir ?= $(prefix)/libexec/git-core
 gitexecdir ?= $(prefix)/libexec/git-core

+mandir ?= $(prefix)/share/man

 man1dir ?= $(mandir)/man1
 man1dir ?= $(mandir)/man1

+htmldir ?= $(prefix)/share/doc/git-doc

 
 ../../GIT-VERSION-FILE: FORCE
        $(MAKE) -C ../../ GIT-VERSION-FILE
 
 ../../GIT-VERSION-FILE: FORCE
        $(MAKE) -C ../../ GIT-VERSION-FILE


@@ -49,12 +50,16 @@ install: $(GIT_SUBTREE)
        $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
        $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)
 
        $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
        $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)
 

-install-doc: install-man
+install-doc: install-man install-html

 
 install-man: $(GIT_SUBTREE_DOC)
        $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
        $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
 
 
 install-man: $(GIT_SUBTREE_DOC)
        $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
        $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
 

+install-html: $(GIT_SUBTREE_HTML)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)
+       $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
+

 $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
        $(XMLTO) -m $(MANPAGE_XSL) man $^
 
 $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
        $(XMLTO) -m $(MANPAGE_XSL) man $^