Skip to content

Commit dfdfff0

Browse files
committed
Merge branch 'pw/meson-doc-mergetool' into next
Update build precedure for mergetool documentation in meson-based builds. * pw/meson-doc-mergetool: meson: fix building mergetool docs
2 parents 920d0c2 + 58e4eee commit dfdfff0

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
@@ -354,13 +354,10 @@ foreach mode : [ 'diff', 'merge' ]
354354
command: [
355355
shell,
356356
'@INPUT@',
357-
'..',
357+
meson.project_source_root(),
358358
mode,
359359
'@OUTPUT@'
360360
],
361-
env: [
362-
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
363-
],
364361
input: 'generate-mergetool-list.sh',
365362
output: 'mergetools-' + mode + '.adoc',
366363
)

0 commit comments

Comments
 (0)