Merge branch 'pw/meson-doc-mergetool'
Update build precedure for mergetool documentation in meson-based builds. * pw/meson-doc-mergetool: meson: fix building mergetool docsmaint
commit
112252c844
|
|
@ -354,13 +354,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',
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue