diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-29 23:23:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-29 23:23:10 +0100 |
| commit | a115088ca904a26d100e479a7fde21c9235bf7c9 (patch) | |
| tree | fb21dea1726656f883eb9c1458f18ad16cebd9bd /run | |
| parent | 51a1cee215700b43fa20e12084b7987ef3b64b42 (diff) | |
| parent | bdcaf60ec37ec694f1e221a33b090f670bf974d6 (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'run')
| -rw-r--r-- | run/environment | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/run/environment b/run/environment index aabb463f3..aa4f77187 100644 --- a/run/environment +++ b/run/environment @@ -1,6 +1,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" build=$DIR/../build -export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then + export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH +fi export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib export DCPOMATIC_GRAPHICS=$DIR/../graphics |