Git fork

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>

authored by

Sebastian Schuberth and committed by
Junio C Hamano
4d24d520 670a3c1d

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