[PATCH v2 2/3] meson: remove duplication of polkit dirs construction

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- meson.build | 2 ++ src/access/meson.build | 2 +- src/remote/meson.build | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ca1b915737..409a44b69c 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,8 @@ localedir = prefix / get_option('localedir') mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') sharedstatedir = prefix / get_option('sharedstatedir') +polkitactionsdir = datadir / 'polkit-1' / 'actions' +polkitrulesdir = datadir / 'polkit-1' / 'rules.d' docdir = get_option('docdir') if docdir == '' diff --git a/src/access/meson.build b/src/access/meson.build index fc5ba5b342..c006ca5934 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -73,7 +73,7 @@ if conf.has('WITH_POLKIT') command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], capture: true, install: true, - install_dir: datadir / 'polkit-1' / 'actions', + install_dir: polkitactionsdir, ) endif endif diff --git a/src/remote/meson.build b/src/remote/meson.build index 831acaaa01..9a0288f928 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -294,15 +294,14 @@ if conf.has('WITH_REMOTE') endif if conf.has('WITH_POLKIT') - polkitdir = datadir / 'polkit-1' install_data( 'libvirtd.policy', - install_dir: polkitdir / 'actions', + install_dir: polkitactionsdir, rename: [ 'org.libvirt.unix.policy' ], ) install_data( 'libvirtd.rules', - install_dir: polkitdir / 'rules.d', + install_dir: polkitrulesdir, rename: [ '50-libvirt.rules' ], ) endif -- 2.47.1