From b0e90c6523f83158cab7f2af621cdd862910dda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 2 Sep 2024 01:07:39 +0200 Subject: [PATCH] build: Don't override `prefix` Meson variables don't have a scope, so using `prefix` in a loop for D-Bus interface prefixes actually overshadows the global variable that holds the build prefix. As far as I can tell, the only place where the "wrong" value is read is the build summary, but let's not tempt fate and fix it. Part-of: --- src/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index f86f0ba34..785565947 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1056,7 +1056,7 @@ foreach dbus_interface: dbus_interfaces endif interface_file = directory / interface - prefix = dbus_interface['prefix'] + interface_prefix = dbus_interface['prefix'] if dbus_interface.has_key('object_manager') object_manager = dbus_interface['object_manager'] @@ -1065,7 +1065,7 @@ foreach dbus_interface: dbus_interfaces endif dbus_sources = gnome.gdbus_codegen(name, interface_file, - interface_prefix: prefix, + interface_prefix: interface_prefix, namespace: 'MetaDBus', object_manager: object_manager, )