aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-04-03 19:31:41 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-04-04 22:47:10 +0300
commitc1fcc8ab3e1cac0823f3527000e543cc96885d48 (patch)
treee0e71c9b3a741aae4bd42357afb7ae05f07ceb1e
parent98267e104effb919fe2a84f72d7d790b57577e34 (diff)
downloadmeson-c1fcc8ab3e1cac0823f3527000e543cc96885d48.zip
meson-c1fcc8ab3e1cac0823f3527000e543cc96885d48.tar.gz
meson-c1fcc8ab3e1cac0823f3527000e543cc96885d48.tar.bz2
gnome.gtkdoc: Fix generated files used as content files
The `gtkdoc` function in the `gnome` module is able to use generated files as content files, but the path to these is wrong in the used command line.
-rw-r--r--mesonbuild/modules/gnome.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 8b6397e..30364a6 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -792,7 +792,7 @@ This will become a hard error in the future.''')
state.backend.get_target_dir(s),
s.get_outputs()[0]))
elif isinstance(s, mesonlib.File):
- content_files.append(s.rel_to_builddir(state.build_to_src))
+ content_files.append(os.path.join(state.environment.get_build_dir(), s.subdir, s.fname))
elif isinstance(s, build.GeneratedList):
depends.append(s)
for gen_src in s.get_outputs():