aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-03-12 00:43:34 +0000
committerAleksey Filippov <alekseyf@google.com>2018-03-17 20:40:50 +0000
commitf720efa2f4939d0225d77038c58739ca517aa4a7 (patch)
tree60149ca797f0254b0311c580562d38644f6b899f /mesonbuild/backend/ninjabackend.py
parent22b19995b180f09bd9356034bff39c0715cdbc20 (diff)
downloadmeson-f720efa2f4939d0225d77038c58739ca517aa4a7.zip
meson-f720efa2f4939d0225d77038c58739ca517aa4a7.tar.gz
meson-f720efa2f4939d0225d77038c58739ca517aa4a7.tar.bz2
Add rename parameter to install_data()
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py9
1 files changed, 4 insertions, 5 deletions
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):