diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2019-08-15 09:41:30 -0400 |
|---|---|---|
| committer | Thibault Saunier <saunierthibault@gmail.com> | 2019-08-15 13:58:07 +0000 |
| commit | ba744068f2075dad4d5d3562c79034f23a6bb90a (patch) | |
| tree | 678e417910d3c48db1af0c157cc6b8c4c849e94b /giscanner | |
| parent | 722d59c14cd0a82a0373fb305d0157f5281c076e (diff) | |
| download | gobject-introspection-ba744068f2075dad4d5d3562c79034f23a6bb90a.tar.gz | |
Make meson.override_find_program working on more complex use cases
Add some missing `meson.override_find_program`
And make sure that the `.gir` we build are found when used uninstalled
as a concequence of `meson.override_find_program`.
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/transformer.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py index f63894cb..bcabdedc 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -183,7 +183,6 @@ None.""" def _get_gi_data_dirs(self): data_dirs = utils.get_system_data_dirs() data_dirs.append(DATADIR) - data_dirs.append(GIRDIR) if os.name != 'nt': # For backwards compatibility, was always unconditionally added to the list. data_dirs.append('/usr/share') @@ -191,9 +190,9 @@ None.""" def _find_include(self, include): searchdirs = self._includepaths[:] + searchdirs.extend(GIRDIR) for path in self._get_gi_data_dirs(): searchdirs.append(os.path.join(path, 'gir-1.0')) - searchdirs.append(os.path.join(DATADIR, 'gir-1.0')) girname = '%s-%s.gir' % (include.name, include.version) for d in searchdirs: |