1From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001
2From: Simon McVittie <smcv@debian.org>
3Date: Thu, 3 Jun 2021 18:55:29 +0100
4Subject: [PATCH] build: Remove redundant computation of dbus data directory
5
6We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir,
7what would ${datadir} be?" but the answer is obviously always going to be
8pk_prefix/pk_datadir.
9
10Signed-off-by: Simon McVittie <smcv@debian.org>
11
12[Retrieved (and slightly updated for duktape fork) from:
13https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123]
14Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
15---
16 meson.build | 3 +--
17 1 file changed, 1 insertion(+), 2 deletions(-)
18
19diff --git a/meson.build b/meson.build
20index 6a6799e..03a7683 100644
21--- a/meson.build
22+++ b/meson.build
23@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
24 endif
25
26 dbus_dep = dependency('dbus-1')
27-dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir])   #changed from sysconfdir with respect to commit#8eada3836465838
28-dbus_policydir = dbus_confdir / 'dbus-1/system.d'
29+dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
30 dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
31
32 # check OS
33--
34GitLab
35
36