* [PATCH] Documentation/Makefile: Allow custom XMLTO binary
@ 2012-09-19 17:06 dborowitz
2012-09-19 17:59 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: dborowitz @ 2012-09-19 17:06 UTC (permalink / raw)
To: git, gitster; +Cc: Dave Borowitz
From: Dave Borowitz <dborowitz@google.com>
Signed-off-by: Dave Borowitz <dborowitz@google.com>
---
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) $@+ $@ && \
--
1.7.12.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary
2012-09-19 17:06 [PATCH] Documentation/Makefile: Allow custom XMLTO binary dborowitz
@ 2012-09-19 17:59 ` Junio C Hamano
2012-09-19 20:49 ` Dave Borowitz
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2012-09-19 17:59 UTC (permalink / raw)
To: dborowitz; +Cc: git
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?
> 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) $@+ $@ && \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary
2012-09-19 17:59 ` Junio C Hamano
@ 2012-09-19 20:49 ` Dave Borowitz
2012-09-19 23:27 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Dave Borowitz @ 2012-09-19 20:49 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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.
>> 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) $@+ $@ && \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/Makefile: Allow custom XMLTO binary
2012-09-19 20:49 ` Dave Borowitz
@ 2012-09-19 23:27 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2012-09-19 23:27 UTC (permalink / raw)
To: Dave Borowitz; +Cc: git
Dave Borowitz <dborowitz@google.com> writes:
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-19 23:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-19 17:06 [PATCH] Documentation/Makefile: Allow custom XMLTO binary dborowitz
2012-09-19 17:59 ` Junio C Hamano
2012-09-19 20:49 ` Dave Borowitz
2012-09-19 23:27 ` Junio C Hamano
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 NNTP newsgroup(s).