summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2014-10-15 18:49:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-15 22:17:08 (GMT)
commit4d24d5202c3c08c999231cc30bf8de70bf11dc80 (patch)
tree5c735fac3e4498bea94b47b3f9161a9fc4302e9e /contrib
parent670a3c1d5a27bfb1cc6b526559c6f5874f00042f (diff)
downloadgit-4d24d5202c3c08c999231cc30bf8de70bf11dc80.zip
git-4d24d5202c3c08c999231cc30bf8de70bf11dc80.tar.gz
git-4d24d5202c3c08c999231cc30bf8de70bf11dc80.tar.bz2
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>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/subtree/.gitignore3
-rw-r--r--contrib/subtree/Makefile9
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..0b9381a 100644
--- a/contrib/subtree/.gitignore
+++ b/contrib/subtree/.gitignore
@@ -1,6 +1,7 @@
*~
git-subtree
-git-subtree.xml
git-subtree.1
+git-subtree.html
+git-subtree.xml
mainline
subproj
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index c2bd703..3071baf 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -5,9 +5,10 @@ all::
-include ../../config.mak
prefix ?= /usr/local
-mandir ?= $(prefix)/share/man
gitexecdir ?= $(prefix)/libexec/git-core
+mandir ?= $(prefix)/share/man
man1dir ?= $(mandir)/man1
+htmldir ?= $(prefix)/share/doc/git-doc
../../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-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-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 $^