diff options
| author | David Ward <david.ward@gatech.edu> | 2022-09-04 08:15:57 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-09-12 00:27:21 -0400 |
| commit | ee5a72919009f5e7bc2f58199120d56ef9264d59 (patch) | |
| tree | 95f62353170aaba46903bef7217a7fc98094d144 /mesonbuild/modules/hotdoc.py | |
| parent | 68add86f7b9b50e51e75447077f460bc2dc78e79 (diff) | |
| download | meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.zip meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.tar.gz meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.tar.bz2 | |
modules: Fix paths to (sub)project source/build directories
The subproject directory name (i.e. 'subprojects') was being added
to the path even for the main project.
Diffstat (limited to 'mesonbuild/modules/hotdoc.py')
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index b354d17..d2445db 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -177,9 +177,8 @@ class HotdocTargetBuilder: value, _ = self.get_value([list, str], 'gi_c_source_roots', default=[], force_list=True) value.extend([ - os.path.join(self.state.environment.get_source_dir(), - self.interpreter.subproject_dir, self.state.subproject), - os.path.join(self.state.environment.get_build_dir(), self.interpreter.subproject_dir, self.state.subproject) + os.path.join(self.sourcedir, self.state.root_subdir), + os.path.join(self.builddir, self.state.root_subdir) ]) self.cmd += ['--gi-c-source-roots'] + value |