From 7d7dbe26323889daef94de7fb8e11e830def39ac Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 5 Oct 2018 12:20:31 +0200 Subject: [PATCH] [meta] Don't hardcode the default libdir Use the configured libdir, so non-defaults paths don't break the script. --- utils/meson.build | 3 ++- utils/setup_dxvk.sh.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/meson.build b/utils/meson.build index 6967fabb..1e276f59 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,5 +1,6 @@ conf = configuration_data() -conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir')) +conf.set('bindir', get_option('bindir')) +conf.set('libdir', get_option('libdir')) conf.set('arch', target_machine.cpu_family()) conf.set('winelib', meson.get_cross_property('winelib', false)) configure_file( diff --git a/utils/setup_dxvk.sh.in b/utils/setup_dxvk.sh.in index dc1153bd..7700421a 100755 --- a/utils/setup_dxvk.sh.in +++ b/utils/setup_dxvk.sh.in @@ -8,7 +8,8 @@ winelib='@winelib@' if [ $winelib == 'True' ]; then dll_ext='dll.so' - dlls_dir="$dlls_dir"/../lib + # strip off the trailing bindir to get to the prefix, then append libdir + dlls_dir="${dlls_dir%/@bindir@}/@libdir@" else dll_ext='dll' fi