diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-03 00:48:03 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-03 00:48:03 +0300 |
| commit | 0b0d787624523ef3ab349bd059c5c50dabd1702a (patch) | |
| tree | 5371859316790cb3c5809b01ec75e1ee31a9ac08 /modules/gnome.py | |
| parent | f9060a70bb9333fb6e4b892563e7245afbcd0074 (diff) | |
| download | meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.zip meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.tar.gz meson-0b0d787624523ef3ab349bd059c5c50dabd1702a.tar.bz2 | |
A bunch more conversions.
Diffstat (limited to 'modules/gnome.py')
| -rw-r--r-- | modules/gnome.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gnome.py b/modules/gnome.py index ac68515..04f5693 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -139,9 +139,9 @@ class GnomeModule: inc_dirs = kwargs.pop('include_directories') if not isinstance(inc_dirs, list): inc_dirs = [inc_dirs] - for id in inc_dirs: - if isinstance(id.held_object, build.IncludeDirs): - scan_command += ['--add-include-path=%s' % inc for inc in id.held_object.get_incdirs()] + for ind in inc_dirs: + if isinstance(ind.held_object, build.IncludeDirs): + scan_command += ['--add-include-path=%s' % inc for inc in ind.held_object.get_incdirs()] else: raise MesonException('Gir include dirs should be include_directories()') if isinstance(girtarget, build.Executable): @@ -248,7 +248,7 @@ class GnomeModule: cmd += ['--interface-prefix', kwargs.pop('interface_prefix')] if 'namespace' in kwargs: cmd += ['--c-namespace', kwargs.pop('namespace')] - cmd += ['--generate-c-code', os.path.join(state.subdir, namebase), '@INPUT@'] + cmd += ['--generate-c-code', '@OUTDIR@/' + namebase, '@INPUT@'] outputs = [namebase + '.c', namebase + '.h'] custom_kwargs = {'input' : xml_file, 'output' : outputs, |