diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-20 23:56:00 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-21 21:25:47 +0200 |
| commit | 30827b5644b00aa01c14a116a0c8fec72e63592e (patch) | |
| tree | c45f0bf4db577d99bad98962c06655b1e4d76137 /mesonbuild/interpreter.py | |
| parent | dd614015e079d3ef6f64a38d349deca49b4f03ce (diff) | |
| download | meson-30827b5644b00aa01c14a116a0c8fec72e63592e.zip meson-30827b5644b00aa01c14a116a0c8fec72e63592e.tar.gz meson-30827b5644b00aa01c14a116a0c8fec72e63592e.tar.bz2 | |
Do not install configure_file output if install_dir is empty. Closes #3270.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 029fe59..16798a4 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2973,9 +2973,11 @@ root and issuing %s. conffile = os.path.normpath(inputfile.relative_name()) if conffile not in self.build_def_files: self.build_def_files.append(conffile) - # Install file if requested + # Install file if requested, we check for the empty string + # for backwards compatibility. That was the behaviour before + # 0.45.0 so preserve it. idir = kwargs.get('install_dir', None) - if isinstance(idir, str): + if isinstance(idir, str) and idir: cfile = mesonlib.File.from_built_file(ofile_path, ofile_fname) self.build.data.append(build.Data([cfile], idir)) return mesonlib.File.from_built_file(self.subdir, output) |