From 34dcc5e16d281a11dbccdb238cefdee678d075d5 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Thu, 13 Dec 2018 18:08:01 +0700 Subject: Simplify logic by setting default value for MESON_INSTALL_DESTDIR_PREFIX --- contrib/meson/InstallSymlink.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/meson/InstallSymlink.py b/contrib/meson/InstallSymlink.py index d0f5151..3f2998c 100644 --- a/contrib/meson/InstallSymlink.py +++ b/contrib/meson/InstallSymlink.py @@ -45,11 +45,9 @@ def main(): args = parser.parse_args() dir_mode = int(args.mode, 8) - install_dir = pathlib.Path(args.install_dir) - meson_destdir = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX') - if meson_destdir: - install_dir = pathlib.Path(meson_destdir).joinpath(install_dir) + meson_destdir = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX', default='') + install_dir = pathlib.Path(meson_destdir, args.install_dir) install_symlink(args.source, args.dest, install_dir, args.isdir, dir_mode) -- cgit v0.12