diff options
| author | Igor Gnatenko <ignatenko@redhat.com> | 2016-08-14 20:07:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-14 20:07:43 +0200 |
| commit | bde123d70ca268d074e1cec6140955880411be07 (patch) | |
| tree | b2c1ed00070971e3d83da747614f612d56938b76 | |
| parent | af0e3e2675dd963bf30e55cb1abc92feabd00cfa (diff) | |
| parent | 660c872422be4ed7fb4499d1263793fb0e976141 (diff) | |
| download | meson-bde123d70ca268d074e1cec6140955880411be07.zip meson-bde123d70ca268d074e1cec6140955880411be07.tar.gz meson-bde123d70ca268d074e1cec6140955880411be07.tar.bz2 | |
Merge pull request #629 from wtay/master
gnome.py: typelib files should be installed in libdir
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index a4663a3..be3c3ac 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -228,9 +228,7 @@ class GnomeModule: 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] |