From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's
Date: Mon, 17 Jun 2013 13:14:51 -0700 [thread overview]
Message-ID: <7vppvkbikk.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <ffea107da7b3b7d5e390d27397d3a72155e942b4.1371402684.git.john@keeping.me.uk> (John Keeping's message of "Sun, 16 Jun 2013 18:13:01 +0100")
John Keeping <john@keeping.me.uk> writes:
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
Thanks; will directly apply 1/2 on maint. I am not absolutely sure
about this one, where variables related to an optional "info"
support used to be in one place but with the patch only "infodir" is
separated away. Maybe it is not a big deal, though.
> Documentation/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index af3d8a4..0cfdc36 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
> prefix ?= $(HOME)
> bindir ?= $(prefix)/bin
> htmldir ?= $(prefix)/share/doc/git-doc
> +infodir ?= $(prefix)/share/info
> pdfdir ?= $(prefix)/share/doc/git-doc
> mandir ?= $(prefix)/share/man
> man1dir = $(mandir)/man1
> @@ -98,7 +99,6 @@ RM ?= rm -f
> MAN_REPO = ../../git-manpages
> HTML_REPO = ../../git-htmldocs
>
> -infodir ?= $(prefix)/share/info
> MAKEINFO = makeinfo
> INSTALL_INFO = install-info
> DOCBOOK2X_TEXI = docbook2x-texi
next prev parent reply other threads:[~2013-06-17 20:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-16 17:13 [PATCH 1/2] Documentation/Makefile: fix spaces around assignments John Keeping
2013-06-16 17:13 ` [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's John Keeping
2013-06-17 20:14 ` Junio C Hamano [this message]
2013-06-18 4:32 ` Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vppvkbikk.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).