From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 22 Jan 2024 16:11:14 +0000 (+0100)
Subject: meson: correctly handle "no" value for sshd?confdir options
X-Git-Tag: v256-rc1~1078
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c7fc5d5f2;p=thirdparty%2Fsystemd.git

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

diff --git a/src/ssh-generator/meson.build b/src/ssh-generator/meson.build
index 70a706f2aa8..4cc64647ed7 100644
--- a/src/ssh-generator/meson.build
+++ b/src/ssh-generator/meson.build
@@ -11,15 +11,17 @@ executables += [
         },
 ]
 
-custom_target(
-        '20-systemd-ssh-proxy.conf',
-        input : '20-systemd-ssh-proxy.conf.in',
-        output : '20-systemd-ssh-proxy.conf',
-        command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
-        install : true,
-        install_dir : libexecdir / 'ssh_config.d')
+if sshconfdir != 'no'
+        custom_target(
+                '20-systemd-ssh-proxy.conf',
+                input : '20-systemd-ssh-proxy.conf.in',
+                output : '20-systemd-ssh-proxy.conf',
+                command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
+                install : true,
+                install_dir : libexecdir / 'ssh_config.d')
 
-install_emptydir(sshconfdir)
+        install_emptydir(sshconfdir)
 
-meson.add_install_script(sh, '-c',
-        ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf', sshconfdir / '20-systemd-ssh-proxy.conf'))
+        meson.add_install_script(sh, '-c',
+                ln_s.format(libexecdir / 'ssh_config.d' / '20-systemd-ssh-proxy.conf', sshconfdir / '20-systemd-ssh-proxy.conf'))
+endif
diff --git a/src/userdb/meson.build b/src/userdb/meson.build
index 260dbab2c85..2ee366dbaee 100644
--- a/src/userdb/meson.build
+++ b/src/userdb/meson.build
@@ -24,15 +24,17 @@ executables += [
         },
 ]
 
-custom_target(
-        '20-systemd-userdb.conf',
-        input : '20-systemd-userdb.conf.in',
-        output : '20-systemd-userdb.conf',
-        command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
-        install : conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no',
-        install_dir : libexecdir / 'sshd_config.d')
+if conf.get('ENABLE_USERDB') == 1 and sshdconfdir != 'no'
+        custom_target(
+                '20-systemd-userdb.conf',
+                input : '20-systemd-userdb.conf.in',
+                output : '20-systemd-userdb.conf',
+                command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
+                install : true,
+                install_dir : libexecdir / 'sshd_config.d')
 
-install_emptydir(sshdconfdir)
+        install_emptydir(sshdconfdir)
 
-meson.add_install_script(sh, '-c',
-        ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf', sshdconfdir / '20-systemd-userdb.conf'))
+        meson.add_install_script(sh, '-c',
+                ln_s.format(libexecdir / 'sshd_config.d' / '20-systemd-userdb.conf', sshdconfdir / '20-systemd-userdb.conf'))
+endif