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