diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-16 22:03:26 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 17:37:35 -0500 |
| commit | a01919976eb08277bad78bb22937601cf5a862e0 (patch) | |
| tree | e366cba35d5e16664c5e3557fd44eb5f17149b07 /mesonbuild/backend/ninjabackend.py | |
| parent | 996f4d89f3d60731306a6a72b339eb5c2dbb5020 (diff) | |
| download | meson-a01919976eb08277bad78bb22937601cf5a862e0.zip meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.gz meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.bz2 | |
Always specify installed data with a File object. Closes #858.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index fa4d5cf..2cd3724 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -682,18 +682,16 @@ int dummy; def generate_data_install(self, d): data = self.build.get_data() + srcdir = self.environment.get_source_dir() + builddir = self.environment.get_build_dir() for de in data: 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) + assert(isinstance(f, mesonlib.File)) + plain_f = os.path.split(f.fname)[1] dstabs = os.path.join(subdir, plain_f) - i = [srcabs, dstabs] + i = [f.absolute_path(srcdir, builddir), dstabs] d.data.append(i) def generate_subdir_install(self, d): |