meson: tweak meson conditionalization for ssh{d,}_config drop-ins

Let's make sure "no" is an acceptable setting for these paths.

(cherry picked from commit a8ea7c19400363847bcd62f3b9ee533fbab0e658)

diff --git a/src/ssh-generator/meson.build b/src/ssh-generator/meson.build
index d5413f71ab50c7eb808ae29e42ad0c1334788b4f..d0473e2cbb3e92fa2b79eacc7c6965bb38f2b8ac 100644 (file)
--- a/src/ssh-generator/meson.build
+++ b/src/ssh-generator/meson.build
@@ -20,7 +20,7 @@ if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
                 install : true,
                 install_dir : sshconfdir.startswith('/usr/') ? sshconfdir : libexecdir / 'ssh_config.d')
 
-        if not sshconfdir.startswith('/usr/')
+        if conf.get('LINK_SSH_PROXY_DROPIN') == 1
                 install_emptydir(sshconfdir)
 
                 meson.add_install_script(sh, '-c',

diff --git a/src/userdb/meson.build b/src/userdb/meson.build
index 413f2bea9fd5409e3dd1d27e49c81289717a5e5a..f6d068500dc6ffbf7762c02917efd497e1304a64 100644 (file)
--- a/src/userdb/meson.build
+++ b/src/userdb/meson.build
@@ -33,7 +33,7 @@ if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
                 install : true,
                 install_dir : sshdconfdir.startswith('/usr/') ? sshdconfdir : libexecdir / 'sshd_config.d')
 
-        if not sshdconfdir.startswith('/usr/')
+        if conf.get('LINK_SSHD_USERDB_DROPIN') == 1
                 install_emptydir(sshdconfdir)
 
                 meson.add_install_script(sh, '-c',