PolicyKit: Branch 'master' - 2 commits

[GitLab Mirror]

 meson.build |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d05a167743d34f943fabcb78118492e935d0ae99
Merge: ba36364 e01aa47
Author: Jan Rybar <jrybar at redhat.com>
Date:   Mon Nov 16 14:45:53 2020 +0000

    Merge branch 'meson-prefix-usr' into 'master'
    
    meson-installed polkit fails to run with default usr/lib prefix
    
    See merge request polkit/polkit!70

commit e01aa47860d804c382fe9abb87251fee58f90dfb
Author: Jan Rybar <jrybar at redhat.com>
Date:   Mon Nov 16 14:57:29 2020 +0100

    meson-installed polkit fails to run with default usr/lib prefix
    
    With default /usr/lib prefix set by meson, polkit service would fail
    with sigsegv. Changing prefix to /usr fixed the issue.
    Also /usr/lib conforms FHS more than /usr/local/lib in terms
    of a system service.

diff --git a/meson.build b/meson.build
index c7b07ba..6997e7f 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,7 @@ project(
   license: 'LGPL2+',
   default_options: [
     'buildtype=debugoptimized',
+    'prefix=/usr',
     'cpp_std=c++17',
   ],
   meson_version: '>= 0.50.0',