]> git.99rst.org Git - git.git/commit
meson: fix building mergetool docs
authorPhillip Wood <redacted>
Mon, 9 Feb 2026 10:08:43 +0000 (10:08 +0000)
committerJunio C Hamano <redacted>
Mon, 9 Feb 2026 17:45:48 +0000 (09:45 -0800)
commit58e4eeeeb5439dc1f629579ba03844500827ff20
tree5e0d6208accf1cdeaec90546ff5c3e4b8f6aa717
parent9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
meson: fix building mergetool docs

Building the documentation with meson when the build directory is
not an immediate subdirectory of the source directory prints the
following error

[2/1349] Generating Documentation/mer... command (wrapped by meson to set env)
../../Documentation/generate-mergetool-list.sh: line 15: ../git-mergetool--lib.sh: No such file or directory

The build does not fail because the failure is upstream of a pipe. Fix
the error by passing the correct source directory when meson runs
"generate-mergetool-list.sh". As that script sets $MERGE_TOOLS_DIR
we do not need to set it in the environment when running the script.

Signed-off-by: Phillip Wood <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/meson.build
git clone https://git.99rst.org/PROJECT