diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2026-02-09 10:08:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-09 09:45:48 -0800 |
| commit | 58e4eeeeb5439dc1f629579ba03844500827ff20 (patch) | |
| tree | 5e0d6208accf1cdeaec90546ff5c3e4b8f6aa717 | |
| parent | 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed (diff) | |
| download | git-58e4eeeeb5439dc1f629579ba03844500827ff20.tar.xz | |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/meson.build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/meson.build b/Documentation/meson.build index c00c9fe7f4..31049f99e1 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -352,13 +352,10 @@ foreach mode : [ 'diff', 'merge' ] command: [ shell, '@INPUT@', - '..', + meson.project_source_root(), mode, '@OUTPUT@' ], - env: [ - 'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools', - ], input: 'generate-mergetool-list.sh', output: 'mergetools-' + mode + '.adoc', ) |