diff options
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rwxr-xr-x | mesonbuild/scripts/gtkdochelper.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index caf162f..1912fc1 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -677,7 +677,7 @@ can not be used with the current version of glib-compiled-resources, due to header_dirs.append(os.path.join(state.environment.get_source_dir(), src_dir.get_curdir(), inc_dir)) else: - header_dirs.append(os.path.normpath(os.path.join(state.subdir, src_dir))) + header_dirs.append(src_dir) args = ['--sourcedir=' + state.environment.get_source_dir(), '--builddir=' + state.environment.get_build_dir(), diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 0cfd644..f4b4f34 100755 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -62,7 +62,15 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, expand_content_files, mode): print("Building documentation for %s" % module) - src_dir_args = ['--source-dir=' + os.path.join(source_root, src_dir) for src_dir in src_subdirs] + src_dir_args = [] + for src_dir in src_subdirs: + if not os.path.isabs(src_dir): + dirs = [os.path.join(source_root, src_dir), + os.path.join(build_root, src_dir)] + else: + dirs = [src_dir] + src_dir_args += ['--source-dir=' + d for d in dirs] + doc_src = os.path.join(source_root, doc_subdir) abs_out = os.path.join(build_root, doc_subdir) htmldir = os.path.join(abs_out, 'html') |