aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-07-01 14:43:51 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-07-01 20:50:47 +0530
commit598997bdb59efa9fe9e72c02d33a350bb8c397bb (patch)
treeccfd1c5742b8be985f93ddfc762f1209e717c252
parent0143c32c7cd82872e42f57216bb94a26191f2824 (diff)
downloadmeson-598997bdb59efa9fe9e72c02d33a350bb8c397bb.zip
meson-598997bdb59efa9fe9e72c02d33a350bb8c397bb.tar.gz
meson-598997bdb59efa9fe9e72c02d33a350bb8c397bb.tar.bz2
scripts/install: Also strip '\' from the end of a path
Fixes installation of subdirs on Windows
-rw-r--r--mesonbuild/scripts/meson_install.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 3a87f2d..3768614 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -43,7 +43,7 @@ def do_install(datafilename):
def install_subdirs(data):
for (src_dir, inst_dir, dst_dir) in data.install_subdirs:
- if src_dir.endswith('/'):
+ if src_dir.endswith('/') or src_dir.endswith('\\'):
src_dir = src_dir[:-1]
src_prefix = os.path.join(src_dir, inst_dir)
print('Installing subdir %s to %s.' % (src_prefix, dst_dir))