Mesa (master): bin/install_megadrivers.py: Fix regression for set DESTDIR

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ed96038e55b37501dae0be09287a6209a966eb85
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed96038e55b37501dae0be09287a6209a966eb85

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Mar 21 09:09:20 2019 -0700

bin/install_megadrivers.py: Fix regression for set DESTDIR

The previous patch tried to address a bug when DESTDIR is '', however,
it introduces a bug when DESTDIR is not '', and fakeroot is used. This
patch does fix that, and has been tested with the arch pkg-build to
ensure it isn't regressed.

Fixes: 093a1ade4e24b7dd701a093d30a71efd669fe9c8
       ("bin/install_megadrivers.py: Correctly handle DESTDIR=''")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110221
Reviewed-by: Eric Engestrom <eric at engestrom.ch>

---

 bin/install_megadrivers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index f751c8329c4..ca543e5ce30 100644
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -35,7 +35,11 @@ def main():
     args = parser.parse_args()
 
     if os.path.isabs(args.libdir):
-        to = os.path.join(os.environ.get('DESTDIR', ''), args.libdir)
+        destdir = os.environ.get('DESTDIR')
+        if destdir:
+            to = os.path.join(destdir, args.libdir[1:])
+        else:
+            to = args.libdir
     else:
         to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir)