subtree: Add an install-html target

PATCH In review Sebastian Schuberth 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Sebastian Schuberth

author

2016-06-15 23:02 UTC #0 lore raw

PATCH 1/2 subtree: Add an install-html target

Also adjust ignore rules accordingly.

Signed-off-by Sebastian Schuberth <[email protected]>

---
 contrib/subtree/.gitignore | 3 ++-
 contrib/subtree/Makefile   | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

contrib/subtree/.gitignore +2 -1

index 91360a3..0b9381a 100644
@@ -1,6 +1,7 @@
 *~
 git-subtree
-git-subtree.xml
 git-subtree.1
+git-subtree.html
+git-subtree.xml
 mainline
 subproj

contrib/subtree/Makefile +7 -2

index c2bd703..3071baf 100644
@@ -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 $^

Signature · 1 line

1.9.4.msysgit.2