From: Ben Knoble <ben.knoble@gmail•com>
To: Patrick Steinhardt <ps@pks•im>
Cc: "D. Ben Knoble" <ben.knoble+github@gmail•com>,
git@vger•kernel.org, Todd Zullinger <tmz@pobox•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] meson: make GIT_HTML_PATH configurable
Date: Thu, 6 Nov 2025 09:08:10 -0500 [thread overview]
Message-ID: <0930DCB8-D545-4043-87F9-4359EA5351D9@gmail.com> (raw)
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!
next prev parent reply other threads:[~2025-11-06 14:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 13:58 [PATCH] meson: make GIT_HTML_PATH configurable D. Ben Knoble
2025-11-04 14:41 ` Junio C Hamano
2025-11-04 16:47 ` Ben Knoble
2025-11-06 7:51 ` Patrick Steinhardt
2025-11-06 7:51 ` Patrick Steinhardt
2025-11-06 14:08 ` Ben Knoble [this message]
2025-11-06 15:29 ` Junio C Hamano
2025-11-11 0:25 ` D. Ben Knoble
2025-11-11 13:43 ` Karthik Nayak
2025-11-11 18:52 ` D. Ben Knoble
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0930DCB8-D545-4043-87F9-4359EA5351D9@gmail.com \
--to=ben.knoble@gmail$(echo .)com \
--cc=ben.knoble+github@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ps@pks$(echo .)im \
--cc=tmz@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox