PolicyKit: Branch 'master'

[GitLab Mirror]

 data/meson.build |    2 +-
 meson.build      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e555982e5801e540925235beec42a2782911ea0
Author: Luciano Santos <luciano.santos at email.com>
Date:   Wed Aug 10 08:48:54 2022 -0300

    build: Honour pam_prefix meson option
    
    Make the use of pam_prefix worth its while since, at the moment, its value
    is not being used. Instead, a hard-coded path is being deployed when it
    shouldn't anymore.

diff --git a/data/meson.build b/data/meson.build
index b7b2fcd..5889495 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,7 +22,7 @@ if enable_pam
     output: '@BASENAME@',
     configuration: pam_conf,
     install: true,
-    install_dir: pk_sysconfdir / 'pam.d',
+    install_dir: pam_prefix,
   )
 endif
 
diff --git a/meson.build b/meson.build
index 9eb52e7..8ffc2ce 100644
--- a/meson.build
+++ b/meson.build
@@ -242,7 +242,7 @@ if enable_pam
 
   pam_prefix = get_option('pam_prefix')
   if pam_prefix == ''
-    pam_prefix = pk_sysconfdir
+    pam_prefix = pk_sysconfdir / 'pam.d'
   else
     message('PAM files will be installed in prefix ' + pam_prefix)
   endif