Skip to content

Commit 58e4eee

Browse files
phillipwoodgitster
authored andcommitted
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>
1 parent 9a2fb14 commit 58e4eee

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

Documentation/meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,10 @@ foreach mode : [ 'diff', 'merge' ]
352352
command: [
353353
shell,
354354
'@INPUT@',
355-
'..',
355+
meson.project_source_root(),
356356
mode,
357357
'@OUTPUT@'
358358
],
359-
env: [
360-
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
361-
],
362359
input: 'generate-mergetool-list.sh',
363360
output: 'mergetools-' + mode + '.adoc',
364361
)

0 commit comments

Comments
 (0)