diff options
| author | Benjamin Berg <bberg@redhat.com> | 2020-01-08 14:08:58 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2020-01-08 14:12:51 +0100 |
| commit | ac8066a743a4be17453d8d06b3d4fcc261de4597 (patch) | |
| tree | 1ca0338a5d87474d07fac8fed6c12787f3f3f88e | |
| parent | c4fa30ac7ddf529e489fd3d59f50b19c26f59f7c (diff) | |
| download | mutter-benzea/use-sysprof-prefix.tar.gz | |
meson: Use sysprof interface defintion from correct prefixbenzea/use-sysprof-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
| -rw-r--r-- | src/meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
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', |