diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-04 22:11:46 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-04 22:11:46 +0200 |
| commit | 67ddeb8a01d094f6826d967ea8f2c9f9c35e745e (patch) | |
| tree | e04baeae0ba2878ad8edf60aeba5aff923a5c0e5 | |
| parent | 73b8ff534115074125568b33ed2c67065c5e91b5 (diff) | |
| download | meson-67ddeb8a01d094f6826d967ea8f2c9f9c35e745e.zip meson-67ddeb8a01d094f6826d967ea8f2c9f9c35e745e.tar.gz meson-67ddeb8a01d094f6826d967ea8f2c9f9c35e745e.tar.bz2 | |
Fix destdir for install targets. Closes #32.
| -rwxr-xr-x | meson_install.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meson_install.py b/meson_install.py index d54cbbc..aaf07c1 100755 --- a/meson_install.py +++ b/meson_install.py @@ -52,11 +52,16 @@ def do_install(datafilename): def install_subdirs(d): for (src_dir, dst_dir) in d.install_subdirs: - dst_dir = d.destdir + dst_dir + if os.path.isabs(dst_dir): + dst_dir = d.destdir + dst_dir + else: + dst_dir = d.fullprefix + dst_dir # Python's copytree works in strange ways. last_level = os.path.split(src_dir)[-1] final_dst = os.path.join(dst_dir, last_level) - shutil.rmtree(final_dst, ignore_errors=True) +# Don't do rmtree because final_dst might point to e.g. /var/www +# We might need to revert to walking the directory tree by hand. +# shutil.rmtree(final_dst, ignore_errors=True) shutil.copytree(src_dir, final_dst, symlinks=True) print('Installing subdir %s to %s.' % (src_dir, dst_dir)) |