Skip to content

Commit 65d3a12

Browse files
committed
git-gui: wire up "git-gui--askyesno" with Meson
The new "git-gui--askyesno" helper script has only been wired up for our Makefile, not for Meson. Wire it up properly to bring both build systems on par with each other again. Signed-off-by: Patrick Steinhardt <ps@pks.im>
1 parent d4fa9a6 commit 65d3a12

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

meson.build

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,21 @@ if target_machine.system() == 'windows'
5454
)
5555
endif
5656

57-
custom_target(
58-
output: 'git-gui--askpass',
59-
input: 'git-gui--askpass.sh',
60-
command: [
61-
shell,
62-
meson.current_source_dir() / 'generate-script.sh',
63-
'@OUTPUT@',
64-
'@INPUT@',
65-
meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
66-
],
67-
install: true,
68-
install_dir: get_option('libexecdir') / 'git-core',
69-
)
57+
foreach script : [ 'git-gui--askpass', 'git-gui--askyesno' ]
58+
custom_target(
59+
output: script,
60+
input: script + '.sh',
61+
command: [
62+
shell,
63+
meson.current_source_dir() / 'generate-script.sh',
64+
'@OUTPUT@',
65+
'@INPUT@',
66+
meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
67+
],
68+
install: true,
69+
install_dir: get_option('libexecdir') / 'git-core',
70+
)
71+
endforeach
7072

7173
custom_target(
7274
input: 'git-gui.sh',

0 commit comments

Comments
 (0)