morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

meson: exit earlier from the subdirectory when bash/zshcompletiondir is 'no'

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-20 14:46:18 +09:00
parent c74dc8cf14
commit d2b8e42742
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell-completion/bash/meson.build
View File

@@ -1,7 +1,9 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
bashcompletiondir = get_option('bashcompletiondir')
if bashcompletiondir == ''
if bashcompletiondir == 'no'
subdir_done()
elif bashcompletiondir == ''
bash_completion = dependency('bash-completion', required : false)
if bash_completion.found()
bashcompletiondir = bash_completion.get_variable(pkgconfig : 'completionsdir')
@@ -14,7 +16,7 @@ custom_target(
input : 'systemctl.in',
output : 'systemctl',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install : bashcompletiondir != 'no',
install : true,
install_dir : bashcompletiondir)
foreach item : [
@@ -58,7 +60,7 @@ foreach item : [
['varlinkctl', ''],
]
if bashcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
if item[1] == '' or conf.get(item[1]) == 1
install_data(item[0],
install_dir : bashcompletiondir)
endif

8
shell-completion/zsh/meson.build
View File

@@ -1,7 +1,9 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
zshcompletiondir = get_option('zshcompletiondir')
if zshcompletiondir == ''
if zshcompletiondir == 'no'
subdir_done()
elif zshcompletiondir == ''
zshcompletiondir = datadir / 'zsh/site-functions'
endif
@@ -9,7 +11,7 @@ custom_target(
input : '_systemctl.in',
output : '_systemctl',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install : zshcompletiondir != 'no',
install : true,
install_dir : zshcompletiondir)
foreach item : [
@@ -44,7 +46,7 @@ foreach item : [
['_varlinkctl', ''],
]
if zshcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
if item[1] == '' or conf.get(item[1]) == 1
install_data(item[0],
install_dir : zshcompletiondir)
endif