diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-20 00:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 00:15:01 +0200 |
| commit | 657836b555ef03c1ad70a855498dee15da19c2dc (patch) | |
| tree | 25402a1b78ac09e70d9994a930590d5274ad9655 /mesonbuild/backend/ninjabackend.py | |
| parent | d012b5b997e917a971bca1236a065453493c780d (diff) | |
| parent | 5f81d362078ec1f1de97fc55cdbebb69d5e37865 (diff) | |
| download | meson-657836b555ef03c1ad70a855498dee15da19c2dc.zip meson-657836b555ef03c1ad70a855498dee15da19c2dc.tar.gz meson-657836b555ef03c1ad70a855498dee15da19c2dc.tar.bz2 | |
Merge pull request #3223 from sarum9in/rename
Add install_data() rename parameter
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9500d69..f0ea09b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -878,11 +878,10 @@ int dummy; subdir = de.install_dir if not subdir: subdir = os.path.join(self.environment.get_datadir(), self.interpreter.build.project_name) - for f in de.sources: - assert(isinstance(f, mesonlib.File)) - plain_f = os.path.basename(f.fname) - dstabs = os.path.join(subdir, plain_f) - i = [f.absolute_path(srcdir, builddir), dstabs, de.install_mode] + for src_file, dst_name in zip(de.sources, de.rename): + assert(isinstance(src_file, mesonlib.File)) + dst_abs = os.path.join(subdir, dst_name) + i = [src_file.absolute_path(srcdir, builddir), dst_abs, de.install_mode] d.data.append(i) def generate_subdir_install(self, d): |