diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-03 21:29:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 21:29:01 +0300 |
| commit | 3f6c55b9b3ac5a19d30cf2b5a33af906c5885cf0 (patch) | |
| tree | bd932935cba186808024ced12678333f5f1a5708 /mesonbuild/interpreter.py | |
| parent | 4828b46b73c0e4874634be0439a1653144e4e0e7 (diff) | |
| parent | 706b3cafab114e8d7ff7306cb471259ae1597e04 (diff) | |
| download | meson-3f6c55b9b3ac5a19d30cf2b5a33af906c5885cf0.zip meson-3f6c55b9b3ac5a19d30cf2b5a33af906c5885cf0.tar.gz meson-3f6c55b9b3ac5a19d30cf2b5a33af906c5885cf0.tar.bz2 | |
Merge pull request #1857 from aradi/configure-subsval
Configure subsval
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 454ee66..39d596f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2344,6 +2344,10 @@ class Interpreter(InterpreterBase): output = kwargs['output'] if not isinstance(output, str): raise InterpreterException('Output file name must be a string') + if ifile_abs: + values = mesonlib.get_filenames_templates_dict([ifile_abs], None) + outputs = mesonlib.substitute_values([output], values) + output = outputs[0] if os.path.split(output)[0] != '': raise InterpreterException('Output file name must not contain a subdirectory.') (ofile_path, ofile_fname) = os.path.split(os.path.join(self.subdir, output)) |