Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 17, 2013, 20:14 UTC
Message-ID: <7vppvkbikk.fsf@alter.siamese.dyndns.org>
In-Reply-To: <ffea107da7b3b7d5e390d27397d3a72155e942b4.1371402684.git.john@keeping.me.uk>

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.

Show 23 quoted lines

>  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