Skip to content
Commit e9ff2b52 authored by Dylan Baker's avatar Dylan Baker Committed by Emil Velikov
Browse files

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: ae3f45c1
       ("bin/install_megadrivers: fix DESTDIR and -D*-path")
Reviewed-by: default avatarEric Engestrom <eric.engestrom@intel.com>
(cherry picked from commit 4188dd78)

Squashed with:

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: default avatarEric Engestrom <eric@engestrom.ch>
(cherry picked from commit ed96038e)
parent 76719ecb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment