From e240f7ea593f06ae2b3d7171e65d67c057ad9f62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Apr 2020 22:25:32 +0200 Subject: [PATCH] =?UTF-8?q?build:=20Install=20keybindings=20relative=20to?= =?UTF-8?q?=20our=20datad=C3=ADr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is a good practice to install files relative to our own variables https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and it is required on systems like NixOS. --- https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 052a2d72b..b5a4d1c00 100644 --- a/meson.build +++ b/meson.build @@ -72,7 +72,7 @@ systemduserunitdir = join_paths(prefix, 'lib', 'systemd', 'user') keybindings_dep = dependency('gnome-keybindings', required: false) if keybindings_dep.found() - keysdir = keybindings_dep.get_pkgconfig_variable('keysdir') + keysdir = keybindings_dep.get_pkgconfig_variable('keysdir', define_variable: ['datadir', datadir]) else keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') endif