[mutter/benzea/use-sysprof-prefix] meson: Use sysprof interface defintion from correct prefix
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/benzea/use-sysprof-prefix] meson: Use sysprof interface defintion from correct prefix
- Date: Wed, 8 Jan 2020 13:12:50 +0000 (UTC)
commit ac8066a743a4be17453d8d06b3d4fcc261de4597
Author: Benjamin Berg <bberg redhat com>
Date: Wed Jan 8 14:08:58 2020 +0100
meson: Use sysprof interface defintion from correct prefix
The sysprof interface definition may be installed to a prefix different
from where mutter is going to be installed. Fetch the prefix from
pkgconfig instead.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/993
src/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/meson.build b/src/meson.build
index fca40d8dc..a1af35d8a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -712,7 +712,9 @@ if have_profiler
'backends/meta-profiler.h',
]
- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
+ # sysprof does not export anything more specific than the prefix
+ sysprof_datadir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), get_option('datadir'))
+ dbus_interfaces_dir = join_paths(sysprof_datadir, 'dbus-1', 'interfaces')
sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]