From f94fc2f497c22bd28b5f04ec58c97e0f4d95486f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 23 Mar 2015 00:21:40 +0300 Subject: [PATCH] modules/gnome: auto-set girepository directory Signed-off-by: Igor Gnatenko --- modules/gnome.py | 1 + test cases/frameworks/7 gnome/gir/meson.build | 3 +-- test cases/frameworks/7 gnome/installed_files.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gnome.py b/modules/gnome.py index c0e391f2d..ef5f6b85c 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -70,6 +70,7 @@ class GnomeModule: typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] kwargs['output'] = typelib_output kwargs['command'] = typelib_cmd + kwargs['install_dir'] = os.path.join(state.environment.get_libdir(), 'girepository-1.0') typelib_target = build.CustomTarget(typelib_name, state.subdir, kwargs) return [scan_target, typelib_target] diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build index 115631e01..cb3308ed8 100644 --- a/test cases/frameworks/7 gnome/gir/meson.build +++ b/test cases/frameworks/7 gnome/gir/meson.build @@ -8,8 +8,7 @@ gnome.generate_gir(girexe, sources : libsources, nsversion : '1.0', namespace : 'Meson', -install : true, -install_dir : 'typelibdir', +install : true ) test('gobject introspection', girexe) diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt index 019b81aad..4267c262b 100644 --- a/test cases/frameworks/7 gnome/installed_files.txt +++ b/test cases/frameworks/7 gnome/installed_files.txt @@ -1,2 +1,2 @@ -usr/typelibdir/Meson-1.0.typelib +usr/lib/girepository-1.0/Meson-1.0.typelib usr/share/glib-2.0/schemas/com.github.meson.gschema.xml