* [PATCH 1/2] subtree: Add an install-html target
@ 2014-10-15 18:49 Sebastian Schuberth
0 siblings, 0 replies; only message in thread
From: Sebastian Schuberth @ 2014-10-15 18:49 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Also adjust ignore rules accordingly.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
contrib/subtree/.gitignore | 3 ++-
contrib/subtree/Makefile | 9 +++++++--
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 $^
--
1.9.4.msysgit.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-15 18:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-15 18:49 [PATCH 1/2] subtree: Add an install-html target Sebastian Schuberth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).