From: Patrick Steinhardt Date: Fri, 13 Dec 2024 08:48:32 GMT Subject: [PATCH 03/10] meson: fix generation of merge tools Message-ID: <20241213-b4-pks-meson-docs-v1-3-0c7895952cd3@pks.im> In-Reply-To: <20241213-b4-pks-meson-docs-v1-0-0c7895952cd3@pks.im> Our buildsystems generate a list of diff and merge tools that ultimately end up in our documentation. And while Meson does wire up the logic, it tries to use the TOOL_MODE environment variable to set up the mode. This is wrong though: the mode is set via an argument that we have fixed to 'diff' mode by accident. Fix this such that merge tools are properly generated. Signed-off-by: Patrick Steinhardt --- Documentation/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/meson.build b/Documentation/meson.build index d23ed82795026e511379ff1e77355d2ec33ec499..0d8b58145274c7854fe3fd91de469fe9d1e0bb6f 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -316,12 +316,11 @@ foreach mode : [ 'diff', 'merge' ] shell, '@INPUT@', '..', - 'diff', + mode, '@OUTPUT@' ], env: [ 'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools', - 'TOOL_MODE=' + mode, ], input: 'generate-mergetool-list.sh', output: 'mergetools-' + mode + '.txt', -- 2.47.1.668.gf74b3f243a.dirty