From: Simon McVittie <smcv@collabora.com>
Date: Fri, 24 Jun 2022 11:47:58 +0000 (+0100)
Subject: build: Make the DBUS_MACHINE_UUID_FILE correctly absolute
X-Git-Tag: dbus-1.15.0~32^2~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eefdbe86f858139463fa3a58a7dbf722bc47c48e;p=thirdparty%2Fdbus.git

build: Make the DBUS_MACHINE_UUID_FILE correctly absolute

get_option('localstatedir') might be relative.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/meson.build b/meson.build
index a703db3a9..63e50daaa 100644
--- a/meson.build
+++ b/meson.build
@@ -705,7 +705,7 @@ config.set_quoted('DBUS_RUNSTATEDIR',
     get_option('localstatedir')
 )
 config.set_quoted('DBUS_MACHINE_UUID_FILE',
-    get_option('localstatedir') / 'lib'/'dbus'/'machine-id'
+    get_option('prefix') / get_option('localstatedir') / 'lib'/'dbus'/'machine-id'
 )
 config.set_quoted('DBUS_SYSTEM_CONFIG_FILE',
     get_option('prefix') / get_option('datadir') / 'dbus-1' / 'system.conf'