PolicyKit: Branch 'master'

[GitLab Mirror]

 meson.build |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 22193ca2cc0f4e023d331cc1391f55143ef9cade
Author: Jan Rybar <jrybar at redhat.com>
Date:   Wed Jan 17 15:09:05 2024 +0000

    Move vendored PAM configuration from /etc

diff --git a/meson.build b/meson.build
index 23d5f28..2f81c90 100644
--- a/meson.build
+++ b/meson.build
@@ -263,7 +263,7 @@ if enable_pam
 
   pam_prefix = get_option('pam_prefix')
   if pam_prefix == ''
-    pam_prefix = pk_sysconfdir / 'pam.d'
+    pam_prefix = pk_prefix / 'lib/pam.d'
   else
     message('PAM files will be installed in prefix ' + pam_prefix)
   endif
@@ -420,7 +420,8 @@ if enable_pam
   output += '        PAM file auth:            ' + pam_conf['PAM_FILE_INCLUDE_AUTH'] + '\n'
   output += '        PAM file acount:          ' + pam_conf['PAM_FILE_INCLUDE_ACCOUNT'] + '\n'
   output += '        PAM file password:        ' + pam_conf['PAM_FILE_INCLUDE_PASSWORD'] + '\n'
-  output += '        PAM file session:         ' + pam_conf['PAM_FILE_INCLUDE_SESSION'] + '\n\n'
+  output += '        PAM file session:         ' + pam_conf['PAM_FILE_INCLUDE_SESSION'] + '\n'
+  output += '        PAM config location:      ' + pam_prefix + '\n\n'
 endif
 output += '        Building api docs:        ' + enable_gtk_doc.to_string() + '\n'
 output += '        Building man pages:       ' + enable_man.to_string() + '\n'