From 48e678db76948cc4b02369b64bc072810535f12f Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 9 Apr 2016 12:04:06 +0300 Subject: Strip leading source tree dir name from install files if it exists. --- mesonbuild/backend/ninjabackend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index d53730a..201b2d1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -547,12 +547,13 @@ int dummy; assert(isinstance(de, build.Data)) subdir = de.install_dir for f in de.sources: + plain_f = os.path.split(f)[1] if de.in_sourcetree: srcprefix = self.environment.get_source_dir() else: srcprefix = self.environment.get_build_dir() srcabs = os.path.join(srcprefix, de.source_subdir, f) - dstabs = os.path.join(subdir, f) + dstabs = os.path.join(subdir, plain_f) i = [srcabs, dstabs] d.data.append(i) -- cgit v1.1