diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-06-15 15:42:14 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-17 15:38:30 +0300 |
| commit | c5cb65eb7c876dee64df5e516953b839afe273f7 (patch) | |
| tree | 0b0a49d160c1264e70ee6f1d0a51687d688f369f /mesonbuild/modules/gnome.py | |
| parent | 8d5361bb1d79c55ef617a33df77ba46bcf136fec (diff) | |
| download | meson-c5cb65eb7c876dee64df5e516953b839afe273f7.zip meson-c5cb65eb7c876dee64df5e516953b839afe273f7.tar.gz meson-c5cb65eb7c876dee64df5e516953b839afe273f7.tar.bz2 | |
gtkdoc: Run gtkdoc-scangobj command from build directory
All paths in CFLAGS are relative to build_root, so current directory
must be there we invoking gtkdoc-scangobj.
Closes: #3379
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index e1702c0..111e7f7 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -870,6 +870,8 @@ This will become a hard error in the future.''') for i in new_args: if expend_file_state and isinstance(i, mesonlib.File): i = i.absolute_path(expend_file_state.environment.get_source_dir(), expend_file_state.environment.get_build_dir()) + elif expend_file_state and isinstance(i, str): + i = os.path.join(expend_file_state.environment.get_source_dir(), expend_file_state.subdir, i) elif not isinstance(i, str): raise MesonException(kwarg_name + ' values must be strings.') args.append(i) |