threads / patch / 31607

patchDocumentation/Makefile: Allow custom XMLTO binary

Subject: [PATCH] Documentation/Makefile: Allow custom XMLTO binary

## tl;dr

4 messages between Sep 19, 2012 and Sep 19, 2012. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

dborowitz@google.com· Sep 19, 2012, 17:06 UTC · lore
From: Dave Borowitz <dborowitz@google.com>
Signed-off-by: Dave Borowitz <dborowitz@google.com>
---
 Documentation/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Show changes to Documentation/Makefile +2 −1
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cf5916f..b045628 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -47,6 +47,7 @@ man7dir=$(mandir)/man7
 ASCIIDOC=asciidoc
 ASCIIDOC_EXTRA =
 MANPAGE_XSL = manpage-normal.xsl
+XMLTO=xmlto
 XMLTO_EXTRA =
 INSTALL?=install
 RM ?= rm -f
@@ -245,7 +246,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
 
 %.1 %.5 %.7 : %.xml manpage-base-url.xsl
 	$(QUIET_XMLTO)$(RM) $@ && \
-	xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
 %.xml : %.txt
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- 
1.7.12.1
Junio C Hamano· Sep 19, 2012, 17:59 UTC · re: dborowitz@google.com · lore

Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary

dborowitz@google.com writes:
> From: Dave Borowitz <dborowitz@google.com>
>
> Signed-off-by: Dave Borowitz <dborowitz@google.com>
> ---

Thanks; the patch sort-of makes sense but makes me wonder what your use case is. Do you have xmlto2 program you want to use in place of xmlto or you have xmlto but not on your $PATH?

Show 24 quoted lines
>  Documentation/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index cf5916f..b045628 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -47,6 +47,7 @@ man7dir=$(mandir)/man7
>  ASCIIDOC=asciidoc
>  ASCIIDOC_EXTRA =
>  MANPAGE_XSL = manpage-normal.xsl
> +XMLTO=xmlto
>  XMLTO_EXTRA =
>  INSTALL?=install
>  RM ?= rm -f
> @@ -245,7 +246,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
>  
>  %.1 %.5 %.7 : %.xml manpage-base-url.xsl
>  	$(QUIET_XMLTO)$(RM) $@ && \
> -	xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
> +	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
>  
>  %.xml : %.txt
>  	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
Dave Borowitz· Sep 19, 2012, 20:49 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary

On Wed, Sep 19, 2012 at 10:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
> dborowitz@google.com writes:
>
>> From: Dave Borowitz <dborowitz@google.com>
>>
>> Signed-off-by: Dave Borowitz <dborowitz@google.com>
>> ---
>
> Thanks; the patch sort-of makes sense but makes me wonder what your
> use case is.  Do you have xmlto2 program you want to use in place of
> xmlto or you have xmlto but not on your $PATH?

The latter; I can easily symlink it into my $PATH of course. But since I was already specifying ASCIIDOC on the make command line for the same reason, I was surprised to find I couldn't also specify XMLTO, hence the patch.

Show 24 quoted lines
>>  Documentation/Makefile | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/Makefile b/Documentation/Makefile
>> index cf5916f..b045628 100644
>> --- a/Documentation/Makefile
>> +++ b/Documentation/Makefile
>> @@ -47,6 +47,7 @@ man7dir=$(mandir)/man7
>>  ASCIIDOC=asciidoc
>>  ASCIIDOC_EXTRA =
>>  MANPAGE_XSL = manpage-normal.xsl
>> +XMLTO=xmlto
>>  XMLTO_EXTRA =
>>  INSTALL?=install
>>  RM ?= rm -f
>> @@ -245,7 +246,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
>>
>>  %.1 %.5 %.7 : %.xml manpage-base-url.xsl
>>       $(QUIET_XMLTO)$(RM) $@ && \
>> -     xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
>> +     $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
>>
>>  %.xml : %.txt
>>       $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
Junio C Hamano· Sep 19, 2012, 23:27 UTC · re: Dave Borowitz · lore

Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary

Dave Borowitz <dborowitz@google.com> writes:
Show 16 quoted lines
> On Wed, Sep 19, 2012 at 10:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> dborowitz@google.com writes:
>>
>>> From: Dave Borowitz <dborowitz@google.com>
>>>
>>> Signed-off-by: Dave Borowitz <dborowitz@google.com>
>>> ---
>>
>> Thanks; the patch sort-of makes sense but makes me wonder what your
>> use case is.  Do you have xmlto2 program you want to use in place of
>> xmlto or you have xmlto but not on your $PATH?
>
> The latter; I can easily symlink it into my $PATH of course. But since
> I was already specifying ASCIIDOC on the make command line for the
> same reason, I was surprised to find I couldn't also specify XMLTO,
> hence the patch.
OK.  Was just curious.

← back to recent threads