Re: [PATCH] Allow generating a non-default set of documentation

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 7, 2012, 22:40 UTC
Message-ID: <7vwqz1oqi4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20121007214855.GB1743@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 9 quoted lines

> On Sun, Oct 07, 2012 at 01:39:32PM -0700, Junio C Hamano wrote:
> ...
>> but it is not so far-fetched to imagine that Windows users may want to
>> omit manpages with
>> 
>>     $ DEFAULT_DOC_TARGET=html make doc
>
> That use case makes a lot more sense to me (or more likely setting it in
> config.mak).

I actually had "ifeq ($(uname_S),Windows)" at the top-level in mind, not config.mak. I think that is far more important use case than going down to Documentation yourself and run make there (which is not a workflow I deeply care about in the first place).

Show 33 quoted lines

>>  Makefile | 12 ++++++++++--
>>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> No change to Documentation/Makefile? So this will work:
>
>   $ echo DEFAULT_DOC_TARGET=html >config.mak
>   $ make doc
>
> but this will not:
>
>   $ cd Documentation
>   $ make
>
> Why not do it like this:
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 267dfe1..ca10313 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -152,7 +152,8 @@ endif
>  endif
>  endif
>  
> -all: html man
> +DEFAULT_DOC_TARGET ?= html man
> +all: $(DEFAULT_DOC_TARGET)
>  
>  html: $(DOC_HTML)
>  
>
> which covers both cases? That is also how we handle DEFAULT_TEST_TARGET.
>
> -Peff