diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-04-09 13:53:09 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-04-26 10:46:37 -0700 |
| commit | 5fb804f346d21f5c9320a8049ae5663fa8070654 (patch) | |
| tree | 38ce329d75785207d592fa6432d60c8a94d19201 | |
| parent | e5405665d28735fb7a6ecc36f32a7647fb1f4162 (diff) | |
bin/install_megadrivers: fix DESTDIR and -D*-path
This fixes -Ddri-drivers-path, -Dvdpau-libs-path, etc. with DESTDIR when
those paths are absolute. Currently due to the way python's os.path.join
handles absolute paths these will ignore DESTDIR, which is bad. This
fixes them to be relative to DESTDIR if that is set.
Fixes: 3218056e0eb375eeda470058d06add1532acd6d4
("meson: Build i965 and dri stack")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
(cherry picked from commit ae3f45c11e3f934939b90445471da8f18b057bc5)
| -rwxr-xr-x | bin/install_megadrivers.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py index 7931a544bd..c04a2a3eb3 100755 --- a/bin/install_megadrivers.py +++ b/bin/install_megadrivers.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding=utf-8 -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -35,7 +35,11 @@ def main(): parser.add_argument('drivers', nargs='+') args = parser.parse_args() - to = os.path.join(os.environ.get('MESON_INSTALL_DESTDIR_PREFIX'), args.libdir) + if os.path.isabs(args.libdir): + to = os.path.join(os.environ.get('DESTDIR', '/'), args.libdir[1:]) + else: + to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir) + master = os.path.join(to, os.path.basename(args.megadriver)) if not os.path.exists(to): |