diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-04 00:37:28 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-04 00:37:28 +0300 |
| commit | a90bbb727784fa27beb4ff07df97b9a07b471d62 (patch) | |
| tree | d095a52a574288117dfddf0e6899224ecd94f1e7 /modules | |
| parent | 0131555e28c2e6bb647dce9911b1b69ba88eeeaa (diff) | |
| download | meson-a90bbb727784fa27beb4ff07df97b9a07b471d62.zip meson-a90bbb727784fa27beb4ff07df97b9a07b471d62.tar.gz meson-a90bbb727784fa27beb4ff07df97b9a07b471d62.tar.bz2 | |
Finally full test suite passes, even gir.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gnome.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gnome.py b/modules/gnome.py index 04f5693..231cbd4 100644 --- a/modules/gnome.py +++ b/modules/gnome.py @@ -147,7 +147,7 @@ class GnomeModule: if isinstance(girtarget, build.Executable): scan_command += ['--program', girtarget] elif isinstance(girtarget, build.SharedLibrary): - scan_command += ["-L", os.path.join (state.environment.get_build_dir(), girtarget.subdir)] + scan_command += ["-L@PRIVATE_OUTDIR_ABS_%s@" % girtarget.get_id()] libname = girtarget.get_basename() scan_command += ['--library', libname] scankwargs = {'output' : girfile, @@ -163,9 +163,9 @@ class GnomeModule: typelib_output = '%s-%s.typelib' % (ns, nsversion) typelib_cmd = ['g-ir-compiler', scan_target, '--output', '@OUTPUT@'] if inc_dirs: - for id in inc_dirs: + for incd in inc_dirs: typelib_cmd += ['--includedir=%s' % inc for inc in - id.held_object.get_incdirs()] + incd.held_object.get_incdirs()] if deps: for dep in deps: girdir = dep.held_object.get_variable ("girdir") |