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

2012-10-08 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> On Sun, Oct 07, 2012 at 04:25:58PM -0700, Junio C Hamano wrote: >> >>> Yeah, modulo that the "defaults" is tracked and does not have to >>> have the dash before "include" (it is an error if it is missing, >>> no?). It may want to be named with s/d

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

2012-10-07 Thread Junio C Hamano
Jeff King writes: > On Sun, Oct 07, 2012 at 04:25:58PM -0700, Junio C Hamano wrote: > >> Yeah, modulo that the "defaults" is tracked and does not have to >> have the dash before "include" (it is an error if it is missing, >> no?). It may want to be named with s/defaults/autodetect/, though. >>

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

2012-10-07 Thread Jeff King
On Sun, Oct 07, 2012 at 04:25:58PM -0700, Junio C Hamano wrote: > Yeah, modulo that the "defaults" is tracked and does not have to > have the dash before "include" (it is an error if it is missing, > no?). It may want to be named with s/defaults/autodetect/, though. > > > diff --git a/Makefile b

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

2012-10-07 Thread Junio C Hamano
Jeff King writes: > On Sun, Oct 07, 2012 at 07:07:03PM -0400, Jeff King wrote: > >> Would it make sense to pull all of our platform-specific tweaks out into >> a config.mak.platform (right before config.mak.autogen)? That would be >> less surprising for cases like this, and I think it would make

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

2012-10-07 Thread Jeff King
On Sun, Oct 07, 2012 at 07:07:03PM -0400, Jeff King wrote: > Would it make sense to pull all of our platform-specific tweaks out into > a config.mak.platform (right before config.mak.autogen)? That would be > less surprising for cases like this, and I think it would make the > Makefile a lot more

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

2012-10-07 Thread Jeff King
On Sun, Oct 07, 2012 at 03:40:19PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > 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_TARGE

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

2012-10-07 Thread Jeff King
On Sun, Oct 07, 2012 at 03:45:52PM -0700, Junio C Hamano wrote: > So here is a proposed update based on your idea, to be squashed on > top (i.e. the change to the top-level Makefile in the posted patch > is not reverted). > > Does it make sense? The change to Documentation/Makefile makes sense,

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

2012-10-07 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> 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 >> >> -a

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

2012-10-07 Thread Junio C Hamano
Jeff King writes: > 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 se

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

2012-10-07 Thread Junio C Hamano
Jeff King writes: > 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 ?= h

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

2012-10-07 Thread Jeff King
On Sun, Oct 07, 2012 at 01:39:32PM -0700, Junio C Hamano wrote: > By default, "make doc" generates the manpages and htmldocs in the > Documentation directory, but you may want to change this depending > on the target environment, e.g. to include 'pdf'. Introduce a new > Makefile variable DEFAULT_

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

2012-10-07 Thread Junio C Hamano
By default, "make doc" generates the manpages and htmldocs in the Documentation directory, but you may want to change this depending on the target environment, e.g. to include 'pdf'. Introduce a new Makefile variable DEFAULT_DOC_TARGET to allow customizing this. The primary motivation is to let u