diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 00:32:41 +0300 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 00:34:31 +0300 |
| commit | 888945ac2e6e212ee06ec7eaa6607b0faf1a2743 (patch) | |
| tree | 30c5c1c1ad932993c7f00fb5ef900d81ee99a255 | |
| parent | f94fc2f497c22bd28b5f04ec58c97e0f4d95486f (diff) | |
| download | meson-888945ac2e6e212ee06ec7eaa6607b0faf1a2743.zip meson-888945ac2e6e212ee06ec7eaa6607b0faf1a2743.tar.gz meson-888945ac2e6e212ee06ec7eaa6607b0faf1a2743.tar.bz2 | |
modules/gnome: install Gir also and auto-detect it's dir
Gir file should be installed in devel subpackage
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | modules/gnome.py | 3 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/installed_files.txt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/gnome.py b/modules/gnome.py index ef5f6b8..53e26ee 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -63,6 +63,9 @@ class GnomeModule: scankwargs = {'output' : girfile, 'input' : libsources, 'command' : scan_command} + if kwargs.get('install'): + scankwargs['install'] = kwargs['install'] + scankwargs['install_dir'] = os.path.join(state.environment.get_datadir(), 'gir-1.0') scan_target = build.CustomTarget(scan_name, state.subdir, scankwargs) typelib_name = girtarget.name + '-typelib' diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt index 4267c26..8464839 100644 --- a/test cases/frameworks/7 gnome/installed_files.txt +++ b/test cases/frameworks/7 gnome/installed_files.txt @@ -1,2 +1,3 @@ usr/lib/girepository-1.0/Meson-1.0.typelib +usr/share/gir-1.0/Meson-1.0.gir usr/share/glib-2.0/schemas/com.github.meson.gschema.xml |