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/scripts/gtkdochelper.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/scripts/gtkdochelper.py')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 2895991..fedcc47 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -122,7 +122,8 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, '--module=' + module, '--cflags=' + cflags, '--ldflags=' + ldflags, - '--ld=' + ld] + '--ld=' + ld, + '--output-dir=' + abs_out] library_paths = [] for ldflag in shlex.split(ldflags): @@ -132,7 +133,7 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, library_paths.append(os.environ['LD_LIBRARY_PATH']) library_path = ':'.join(library_paths) - gtkdoc_run_check(scanobjs_cmd, abs_out, library_path) + gtkdoc_run_check(scanobjs_cmd, build_root, library_path) # Make docbook files if mode == 'auto': |