From c5169b444118da7f072a16a27c77ce3128a55548 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 9 Sep 2024 13:59:10 +0200
Subject: [PATCH] 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)
---
 src/ssh-generator/meson.build | 2 +-
 src/userdb/meson.build        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ssh-generator/meson.build b/src/ssh-generator/meson.build
index d5413f71ab5..d0473e2cbb3 100644
--- 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 413f2bea9fd..f6d068500dc 100644
--- 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',