meson: remove duplication of polkit dirs construction

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/meson.build b/meson.build
index ca1b9157370a38b6b4389722b97c0973fb5f673f..409a44b69c5b427fbe5d99e2b9b475e41970b00f 100644 (file)
--- 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 fc5ba5b342561e4ed37063c090acf7eedc74446e..c006ca5934600ec62ce6839493e0a09ab456c6fb 100644 (file)
--- 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 831acaaa01502478f503112056202cbffea9752f..9a0288f928f87b2d21f0d42bc33c1765dcd6deee 100644 (file)
--- 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