From 4188dd7879a374b698d5f50c84cd26b2606f1ee3 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 20 Mar 2019 10:50:10 -0700 Subject: [PATCH] bin/install_megadrivers.py: Correctly handle DESTDIR='' Currently if destdir is set to '' then the resulting libdir will have it's first character replaced by / instead of / being prepended to the string. This was the result of ensuring that that DESTDIR wouldn't be ignored if libdir was absolute, since the only cases that meson allows the libdir to be absolute is if the prefix is /, this won't be a problem. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110211 Fixes: ae3f45c11e3f934939b90445471da8f18b057bc5 ("bin/install_megadrivers: fix DESTDIR and -D*-path") Reviewed-by: Eric Engestrom --- bin/install_megadrivers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py index d29b1911218..f751c8329c4 100644 --- a/bin/install_megadrivers.py +++ b/bin/install_megadrivers.py @@ -35,7 +35,7 @@ def main(): args = parser.parse_args() if os.path.isabs(args.libdir): - to = os.path.join(os.environ.get('DESTDIR', '/'), args.libdir[1:]) + to = os.path.join(os.environ.get('DESTDIR', ''), args.libdir) else: to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir) -- 2.30.2