Commit 599ed069 authored by Simon McVittie's avatar Simon McVittie Committed by Simon McVittie
Browse files

build: Make the directory for helper executables consistent with Autotools



The Autotools build system has been using /usr/lib/polkit-1 for several
releases, even on distributions where the library directory is /usr/lib64
or /usr/lib/x86_64-linux-gnu, so it makes sense for Meson to do the same.
This lets 32- and 64-bit polkit agents share a single helper executable.

This might be superseded by polkit!63, which requests going back to using
the libexecdir for these (like polkit 0.105 did), which would also make
sense; but until that's decided, let's at least be consistent between
our two build systems.

Every time we change this, all programs that have already loaded
libpolkit-agent into their address space need to be restarted, unless
distributions provide compatibility symlinks.
Signed-off-by: default avatarSimon McVittie <smcv@debian.org>
parent 025f9a6b
Pipeline #337131 passed with stage
in 5 minutes and 46 seconds
service_conf = {'libprivdir': pk_prefix / pk_pkglibdir}
service_conf = {'libprivdir': pk_prefix / pk_libprivdir}
configure_file(
input: 'org.freedesktop.PolicyKit1.service.in',
......
......@@ -27,7 +27,8 @@ pk_sysconfdir = get_option('sysconfdir')
pk_pkgdatadir = pk_datadir / pk_api_name
pk_pkgincludedir = pk_includedir / pk_api_name
pk_pkglibdir = pk_libdir / pk_api_name
# note that this is always 'lib', not lib64 or lib/x86_64-linux-gnu
pk_libprivdir = 'lib' / pk_api_name
pk_pkgsysconfdir = pk_sysconfdir / pk_api_name
pk_actiondir = pk_api_name / 'actions'
......@@ -324,7 +325,7 @@ meson.add_install_script(
'meson_post_install.py',
get_option('bindir'),
pk_pkgdatadir,
pk_pkglibdir,
pk_libprivdir,
pk_pkgsysconfdir,
polkitd_user,
)
......
......@@ -115,5 +115,5 @@ executable(
dependencies: deps,
c_args: '-D_POLKIT_COMPILATION',
install: true,
install_dir: pk_pkglibdir,
install_dir: pk_libprivdir,
)
......@@ -68,5 +68,5 @@ executable(
c_args: c_flags,
link_with: libpolkit_backend,
install: true,
install_dir: pk_pkglibdir,
install_dir: pk_libprivdir,
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment