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

meson: correctly handle "no" value for sshd?confdir options

Browse Source
This commit is contained in:
Frantisek Sumsal
2024-01-22 17:11:14 +01:00
committed by Luca Boccassi
parent 22ce047394
commit 6c7fc5d5f2
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ssh-generator/meson.build
View File

@@ -11,15 +11,17 @@ executables += [
}, },
] ]
custom_target( if sshconfdir != 'no'
'20-systemd-ssh-proxy.conf', custom_target(
input : '20-systemd-ssh-proxy.conf.in', '20-systemd-ssh-proxy.conf',
output : '20-systemd-ssh-proxy.conf', input : '20-systemd-ssh-proxy.conf.in',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], output : '20-systemd-ssh-proxy.conf',
install : true, command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install_dir : libexecdir / 'ssh_config.d') install : true,
install_dir : libexecdir / 'ssh_config.d')
install_emptydir(sshconfdir) install_emptydir(sshconfdir)
meson.add_install_script(sh, '-c', meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf', sshconfdir / '20-systemd-ssh-proxy.conf')) ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf', sshconfdir / '20-systemd-ssh-proxy.conf'))
endif

22
src/userdb/meson.build
View File

@@ -24,15 +24,17 @@ executables += [
}, },
] ]
custom_target( if conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no'
'20-systemd-userdb.conf', custom_target(
input : '20-systemd-userdb.conf.in', '20-systemd-userdb.conf',
output : '20-systemd-userdb.conf', input : '20-systemd-userdb.conf.in',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], output : '20-systemd-userdb.conf',
install : conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install_dir : libexecdir / 'sshd_config.d') install : true,
install_dir : libexecdir / 'sshd_config.d')
install_emptydir(sshdconfdir) install_emptydir(sshdconfdir)
meson.add_install_script(sh, '-c', meson.add_install_script(sh, '-c',
ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf', sshdconfdir / '20-systemd-userdb.conf')) ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf', sshdconfdir / '20-systemd-userdb.conf'))
endif