From c42167dc6f49ac5c3045ec24e2ccbaa204abe079 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Thu, 8 Dec 2016 13:49:31 -0500 Subject: gnome.gtkdoc(): Include builddir variant of include dirs also This avoids the need for users to constantly join paths themselves as this is commonly included. --- mesonbuild/scripts/gtkdochelper.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mesonbuild/scripts') diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 0cfd6446a..f4b4f349a 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') -- cgit v1.2.3