From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH v2 2/2] Allow installing a non-default set of documentation
Date: Thu, 3 Jan 2013 11:05:20 -0800 [thread overview]
Message-ID: <1357239920-2201-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1357239920-2201-1-git-send-email-gitster@pobox.com>
In a fashion similar to the previous DEFAULT_DOC_TARGET patch, teach
the build procedure to allow installing the documentation sets
specified via DEFAULT_DOC_INSTALL_TARGET.
These two symbols must be separate, as we should allow formatting
more than what will be installed. The default has been to format
both html and manpages, and to install only the latter.
$ make DEFAULT_DOC_INSTALL_TARGET='html man' install-doc
will format and install both html and manpages.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/Makefile | 3 ++-
Makefile | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 0f8fdf8..bd7800d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -69,6 +69,7 @@ endif
-include ../config.mak
DEFAULT_DOC_TARGET ?= html man
+DEFAULT_DOC_INSTALL_TARGET ?= $(DEFAULT_DOC_TARGET)
#
# For docbook-xsl ...
@@ -171,7 +172,7 @@ info: git.info gitman.info
pdf: user-manual.pdf
-install: install-man
+install: $(patsubst %,install-%,$(DEFAULT_DOC_INSTALL_TARGET))
install-man: man
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
diff --git a/Makefile b/Makefile
index 71655a7..422a15f 100644
--- a/Makefile
+++ b/Makefile
@@ -287,6 +287,8 @@ all::
# DEFAULT_DOC_TARGET='man html info pdf'
# DEFAULT_DOC_TARGET='html'
#
+# DEFAULT_DOC_INSTALL_TARGET can be used in a similar way.
+#
# Define COMPUTE_HEADER_DEPENDENCIES to "yes" if you want dependencies on
# header files to be automatically computed, to avoid rebuilding objects when
# an unrelated header file changes. Define it to "no" to use the hard-coded
@@ -1428,6 +1430,7 @@ ifneq (,$(SOCKLEN_T))
endif
DEFAULT_DOC_TARGET ?= html man
+DEFAULT_DOC_INSTALL_TARGET ?= man
ifeq ($(uname_S),Darwin)
ifndef NO_FINK
@@ -2379,7 +2382,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
$(VCSSVN_LIB): $(VCSSVN_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
-export DEFAULT_EDITOR DEFAULT_PAGER DEFAULT_DOC_TARGET
+export DEFAULT_EDITOR DEFAULT_PAGER DEFAULT_DOC_TARGET DEFAULT_DOC_INSTALL_TARGET
doc:
$(MAKE) -C Documentation all
--
1.8.1.293.g4a210a9
next prev parent reply other threads:[~2013-01-03 19:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-03 19:05 [PATCH v2 0/2] DEFAULT_DOC_TARGET Junio C Hamano
2013-01-03 19:05 ` [PATCH v2 1/2] Allow generating a non-default set of documentation Junio C Hamano
2013-01-03 19:05 ` Junio C Hamano [this message]
2013-01-03 20:32 ` [PATCH v2 0/2] DEFAULT_DOC_TARGET Jeff King
2013-01-03 20:37 ` Jeff King
2013-01-03 21:05 ` Jeff King
2013-01-03 21:07 ` Jeff King
2013-01-03 22:20 ` Junio C Hamano
2013-01-03 22:25 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357239920-2201-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).