File meson-typelib-install.patch of Package meson

Overview Repositories Revisions Requests Users Attributes Meta

File meson-typelib-install.patch of Package meson

From 660c872422be4ed7fb4499d1263793fb0e976141 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 4 Jul 2016 12:29:56 +0200
Subject: [PATCH] gnome.py: typelib files should be installed in libdir

The typelib files should be installed in libdir, even on debian (which
has them in /usr/lib/x86_64-linux-gnu/girepository-1.0/).
---
 mesonbuild/modules/gnome.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 2c37655..037b1f5 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -228,9 +228,7 @@ def generate_gir(self, state, args, kwargs):
 
         kwargs['output'] = typelib_output
         kwargs['command'] = typelib_cmd
-        # Note that this can't be libdir, because e.g. on Debian it points to
-        # lib/x86_64-linux-gnu but the girepo dir is always under lib.
-        kwargs['install_dir'] = 'lib/girepository-1.0'
+        kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0')
         typelib_target = TypelibTarget(typelib_output, state.subdir, kwargs)
         return [scan_target, typelib_target]

Places

File meson-typelib-install.patch of Package meson

Places