From: Ben Knoble <ben.knoble@gmail.com>
Date: Thu, 06 Nov 2025 14:08:10 GMT
Subject: Re: [PATCH] meson: make GIT_HTML_PATH configurable
Message-ID: <0930DCB8-D545-4043-87F9-4359EA5351D9@gmail.com>
In-Reply-To: <aQxTZNYKKAsmL9Sg@pks.im>


> 
> Le 6 nov. 2025 à 02:51, Patrick Steinhardt <ps@pks.im> a écrit :
> 
> On Tue, Nov 04, 2025 at 08:58:29AM -0500, D. Ben Knoble wrote:
>> Makefile-based builds can configure Git's internal HTML_PATH by defining
>> htmldir, which is useful for packagers that put documentation in
>> different locations. Gentoo, for example, uses version-suffixed
>> directories like ${prefix}/share/doc/git-2.51 and puts the HTML
>> documentation in an 'html' subdirectory of the same.
>> 
>> Propagate the same configuration knob to Meson-based builds so that
>> "git --html-path" on such systems can be configured to output the
>> correct directory.
> 
> Makes sense.
> 
>> diff --git a/Documentation/meson.build b/Documentation/meson.build
>> index 9d24f2da54..c00c9fe7f4 100644
>> --- a/Documentation/meson.build
>> +++ b/Documentation/meson.build
> 
> All of the conversions look sensible to me.
> 
>> diff --git a/meson.build b/meson.build
>> index 2b763f7c53..1f95a06edb 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -768,13 +768,18 @@ if test_output_directory == ''
>>   test_output_directory = meson.project_build_root() / 'test-output'
>> endif
>> 
>> +htmldir = get_option('htmldir')
>> +if htmldir == ''
>> +  htmldir = get_option('datadir') / 'doc/git-doc'
>> +endif
> 
> This retains the status quo, good.
> 
>> diff --git a/meson_options.txt b/meson_options.txt
>> index 143dee9237..13d421c067 100644
>> --- a/meson_options.txt
>> +++ b/meson_options.txt
>> @@ -1,6 +1,8 @@
>> # Configuration for Git installation
>> option('perllibdir', type: 'string', value: '',
>>   description: 'Directory to install perl lib to. Defaults to <datadir>/perl5')
>> +option('htmldir', type: 'string', value: '',
>> +  description: 'Directory to install HTML docs to. Defaults to <datadir>/doc/git-doc')
> 
> Tiny nit: let's keep these options ordered lexicographically.

Can do. Shall I send v2, Junio?

> 
> Other than that the patch looks good to me, thanks!
> 
> Patrick

Thank you!