diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1c21cce..bb8c9ac 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1185,8 +1185,8 @@ class GnomeModule(ExtensionModule): scan_command += list(scan_external_ldflags) if self._gir_has_option('--sources-top-dirs'): - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] + scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), state.root_subdir)] + scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), state.root_subdir)] if '--warn-error' in scan_command: FeatureDeprecated.single_use('gnome.generate_gir argument --warn-error', '0.55.0', 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 |