diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5fc6d6b..f77d2b1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -782,8 +782,8 @@ int dummy; subdir = m.get_custom_install_dir() if subdir is None: subdir = os.path.join(manroot, 'man' + num) - srcabs = os.path.join(self.environment.get_source_dir(), m.get_source_subdir(), f) - dstabs = os.path.join(subdir, os.path.split(f)[1] + '.gz') + srcabs = f.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir()) + dstabs = os.path.join(subdir, os.path.split(f.fname)[1] + '.gz') i = [srcabs, dstabs] d.man.append(i) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1858e8c..94fb649 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -465,13 +465,10 @@ class InstallDir(InterpreterObject): class Man(InterpreterObject): - def __init__(self, source_subdir, sources, kwargs): + def __init__(self, sources, kwargs): InterpreterObject.__init__(self) - self.source_subdir = source_subdir self.sources = sources self.validate_sources() - if len(kwargs) > 1: - raise InvalidArguments('Man function takes at most one keyword arguments.') self.custom_install_dir = kwargs.get('install_dir', None) if self.custom_install_dir is not None and not isinstance(self.custom_install_dir, str): raise InterpreterException('Custom_install_dir must be a string.') @@ -491,9 +488,6 @@ class Man(InterpreterObject): def get_sources(self): return self.sources - def get_source_subdir(self): - return self.source_subdir - class GeneratedObjectsHolder(InterpreterObject): def __init__(self, held_object): super().__init__() @@ -2354,9 +2348,9 @@ class Interpreter(InterpreterBase): return h @permittedKwargs(permitted_kwargs['install_man']) - @stringArgs def func_install_man(self, node, args, kwargs): - m = Man(self.subdir, args, kwargs) + fargs = self.source_strings_to_files(args) + m = Man(fargs, kwargs) self.build.man.append(m) return m |