X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Fenvironment;h=aabb463f366274de186c8e582fbeca08db4849ba;hb=HEAD;hp=0e74572a09e0ecbf9f9bbed960c9de5f14905582;hpb=27312cda2990371d7bf44a94a7513b0117db6ac1;p=dcpomatic.git

diff --git a/run/environment b/run/environment
index 0e74572a0..dac7bef55 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 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
-DCPOMATIC_GRAPHICS=$DIR/../graphics
+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:/Users/ci/workspace/lib
+export DCPOMATIC_GRAPHICS=$DIR/../graphics