From a2de804e56618b839966120dae012f3c8d7aef82 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Thu, 12 Sep 2024 11:32:06 +0200
Subject: pam_env: install environment file in vendordir

If vendordir is enabled, the distribution provided configuration files
should be below this directory and not in /etc.
---
 meson.build                | 2 ++
 modules/module-meson.build | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 107fe1d1..840ff74f 100644
--- a/meson.build
+++ b/meson.build
@@ -83,10 +83,12 @@ cdata.set('SCONFIGDIR', sconfigdir)
 vendordir = get_option('vendordir')
 if get_option('vendordir') == ''
   vendor_sconfigdir = sconfigdir
+  vendor_sysconfdir = sysconfdir
   stringparam_vendordir = []
   stringparam_profileconditions = 'without_vendordir'
 else
   vendor_sconfigdir = vendordir / 'security'
+  vendor_sysconfdir = vendordir
   cdata.set_quoted('VENDORDIR', vendordir)
   cdata.set_quoted('VENDOR_SCONFIG_DIR', vendor_sconfigdir)
   stringparam_vendordir = ['--stringparam', 'vendordir', vendordir]
diff --git a/modules/module-meson.build b/modules/module-meson.build
index 3804221e..acb70875 100644
--- a/modules/module-meson.build
+++ b/modules/module-meson.build
@@ -268,7 +268,7 @@ if module == 'pam_env'
   )
   install_data(
     'environment',
-    install_dir: sysconfdir,
+    install_dir: vendor_sysconfdir,
     install_tag: 'config',
   )
 endif
-- 
cgit v1.2.3