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>
Sebastian Schuberth committed
Oct 15, 2014 at 20:49 UTC
4d24d5202c3c08c999231cc30bf8de70bf11dc80
2 files changed
+9
-3
contrib/subtree/.gitignore
+2
-1
@@ -1,6 +1,7 @@
1
*~
2
git-subtree
3
-git-subtree.xml
3
git-subtree.1
4
+git-subtree.html
5
+git-subtree.xml
6
mainline
7
subproj
contrib/subtree/Makefile
+7
-2
@@ -5,9 +5,10 @@ all::
5
-include ../../config.mak
6
7
prefix ?= /usr/local
8
-mandir ?= $(prefix)/share/man
8
gitexecdir ?= $(prefix)/libexec/git-core
9
+mandir ?= $(prefix)/share/man
10
man1dir ?= $(mandir)/man1
11
+htmldir ?= $(prefix)/share/doc/git-doc
12
13
../../GIT-VERSION-FILE: FORCE
14
$(MAKE) -C ../../ GIT-VERSION-FILE
@@ -49,12 +50,16 @@ install: $(GIT_SUBTREE)
50
$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
51
$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)
52
52
-install-doc: install-man
53
+install-doc: install-man install-html
54
55
install-man: $(GIT_SUBTREE_DOC)
56
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
57
$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
58
59
+install-html: $(GIT_SUBTREE_HTML)
60
+ $(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)
61
+ $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
62
+
63
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
64
$(XMLTO) -m $(MANPAGE_XSL) man $^
65