diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-02-04 14:03:11 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-02-05 22:34:30 +0200 |
| commit | 20c1cb7d02f77ada1446b592d8915ec4945994e3 (patch) | |
| tree | 071691bc241cf9f91b66ce28fe1f22abdc559242 | |
| parent | 66b14e20cc3a900a1bc15bc2bb1631a3f98a28c5 (diff) | |
| download | meson-20c1cb7d02f77ada1446b592d8915ec4945994e3.zip meson-20c1cb7d02f77ada1446b592d8915ec4945994e3.tar.gz meson-20c1cb7d02f77ada1446b592d8915ec4945994e3.tar.bz2 | |
Fix install_subdir() installation message
Print full destination path in 'Installing subdir ...' message,
including DESTDIR, consistent with other installation functions.
Use separate dst_dir and full_dst_dir variables to avoid mixing up
the order in the future and make code more readable.
Closes #3006.
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 44e4d69..cbc782d 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -218,11 +218,11 @@ def do_install(datafilename): def install_subdirs(d): for (src_dir, dst_dir, mode, exclude) in d.install_subdirs: - print('Installing subdir %s to %s' % (src_dir, dst_dir)) - dst_dir = get_destdir_path(d, dst_dir) - d.dirmaker.makedirs(dst_dir, exist_ok=True) - do_copydir(d, src_dir, dst_dir, exclude) - set_mode(dst_dir, mode) + full_dst_dir = get_destdir_path(d, dst_dir) + print('Installing subdir %s to %s' % (src_dir, full_dst_dir)) + d.dirmaker.makedirs(full_dst_dir, exist_ok=True) + do_copydir(d, src_dir, full_dst_dir, exclude) + set_mode(full_dst_dir, mode) def install_data(d): for i in d.data: |