From f0265381925338ece44f3972723adeae891ad91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 20 Sep 2016 16:46:30 +0100 Subject: [PATCH] meson: figure out wayland-protocols pkgdatadir via pkg-config Instead of hardcoding the location. --- gdk/wayland/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index 85cac8bb04..6783ecf193 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -1,8 +1,13 @@ if wayland_enabled - #TODO: This should come from pkg-config --variable=pkgdatadir wayland-protocols - wayland_protocols_datadir = '/home/baedert/Source/gnome-configure/share/wayland-protocols/' + runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols') + if runcmd.returncode() == 0 + wayland_protocols_datadir = runcmd.stdout().strip() + '/' + else + error('Could not get wayland-protocols pkgdatadir via pkg-config.') + endif + wayland_scanner = find_program('wayland-scanner') genprotocols = find_program('genprotocolfiles.py')