From f720efa2f4939d0225d77038c58739ca517aa4a7 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Mon, 12 Mar 2018 00:43:34 +0000 Subject: Add rename parameter to install_data() --- mesonbuild/backend/ninjabackend.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ba249ed..408e4d4 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): -- cgit v1.1