DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

[Derek Moore]

Following the INSTALL doc, I was building git with:

make prefix=/usr/local all doc info

Even after installing docbook2X, I couldn't get past the first DB2TEXI
build step until I discovered that 'docbook2x-texi' is named
'db2x_docbook2texi' in Fedora 21 using the latest upstream docbook2X
0.8.8.

To the "everything" build to complete, I had to make this change:

$ git diff
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cea0e7a..0e6c70a 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -107,7 +107,7 @@ HTML_REPO = ../../git-htmldocs

 MAKEINFO = makeinfo
 INSTALL_INFO = install-info
-DOCBOOK2X_TEXI = docbook2x-texi
+DOCBOOK2X_TEXI = db2x_docbook2texi
 DBLATEX = dblatex
 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
 ifndef PERL_PATH


I searched the mailing list, but don't see 'db2x_docbook2texi'
mentioned since 2010, so I feel somewhat safe brining it up again.

Not sure if the Makefile should somehow conditionally use one or the
other of these commands. ... Or maybe I should have gone the 'make
configure' route?

Thanks,

Derek

Re: DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

[Jeff King]

On Thu, Oct 09, 2014 at 12:53:33PM -0500, Derek Moore wrote:

> Following the INSTALL doc, I was building git with:
> 
> make prefix=/usr/local all doc info

I wonder if it is actually sane to recommend building "info" for
newcomers in INSTALL. I do not know if many of the list regulars do so
(I certainly do not), or if it is part of anybody's testing regimen.

> $ git diff
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index cea0e7a..0e6c70a 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -107,7 +107,7 @@ HTML_REPO = ../../git-htmldocs
> 
>  MAKEINFO = makeinfo
>  INSTALL_INFO = install-info
> -DOCBOOK2X_TEXI = docbook2x-texi
> +DOCBOOK2X_TEXI = db2x_docbook2texi
>  DBLATEX = dblatex
>  ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
>  ifndef PERL_PATH

I don't think we would want to take a patch like this, as it is still
called docbook2x-texi at least on Debian.

You can override variables with:

  make DOCBOOK2X_TEXI=db2x_docbook2texi ...

or if you want to use it for multiple make invocations:

  echo DOCBOOK2_TEXI=db2x_docbook2texi >config.mak

If we want a patch to make this Just Work out of the box on Fedora, I'd
suggest looking at config.mak.uname (though I am not sure if there is
enough information there currently to determine Fedora versus another
distro), and/or a patch to configure.ac to detect which name we have.

-Peff

Re: DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

[Derek Moore]

:) Wasn't proposing a patch, that's for sure, was just evincing the
change that worked for me.

I agree INSTALL instructions should be fixed up and/or the
DOCBOOK2X_TEXI should be conditionally assigned in a sane manner.

I'd first want to inspect upstream docbook2X build process and Fedora
docbook2X RPM .spec, to see which name is canonical and how you guys
came up with "docbook2x-texi".

Seems there are now plenty of opportunities for me get my name in
git's AUTHORS list. ;)


On Thu, Oct 9, 2014 at 2:35 PM, Jeff King <peff@peff.net> wrote:
> On Thu, Oct 09, 2014 at 12:53:33PM -0500, Derek Moore wrote:
>
>> Following the INSTALL doc, I was building git with:
>>
>> make prefix=/usr/local all doc info
>
> I wonder if it is actually sane to recommend building "info" for
> newcomers in INSTALL. I do not know if many of the list regulars do so
> (I certainly do not), or if it is part of anybody's testing regimen.
>
>> $ git diff
>> diff --git a/Documentation/Makefile b/Documentation/Makefile
>> index cea0e7a..0e6c70a 100644
>> --- a/Documentation/Makefile
>> +++ b/Documentation/Makefile
>> @@ -107,7 +107,7 @@ HTML_REPO = ../../git-htmldocs
>>
>>  MAKEINFO = makeinfo
>>  INSTALL_INFO = install-info
>> -DOCBOOK2X_TEXI = docbook2x-texi
>> +DOCBOOK2X_TEXI = db2x_docbook2texi
>>  DBLATEX = dblatex
>>  ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
>>  ifndef PERL_PATH
>
> I don't think we would want to take a patch like this, as it is still
> called docbook2x-texi at least on Debian.
>
> You can override variables with:
>
>   make DOCBOOK2X_TEXI=db2x_docbook2texi ...
>
> or if you want to use it for multiple make invocations:
>
>   echo DOCBOOK2_TEXI=db2x_docbook2texi >config.mak
>
> If we want a patch to make this Just Work out of the box on Fedora, I'd
> suggest looking at config.mak.uname (though I am not sure if there is
> enough information there currently to determine Fedora versus another
> distro), and/or a patch to configure.ac to detect which name we have.
>
> -Peff