From a808f38c1e59c5a08fc2097bcde901c3e72406b1 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 30 Nov 2005 19:45:28 +0100
Subject: [PATCH] Added support for Darwin DYLD_LIBRARY_PATH.

---
 tools/winewrapper | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tools/winewrapper b/tools/winewrapper
index 1165dc91a93..c958b60c391 100755
--- a/tools/winewrapper
+++ b/tools/winewrapper
@@ -62,12 +62,25 @@ fi
 
 topdir=`cd "$topdir" && pwd`
 
-if [ -n "$LD_LIBRARY_PATH" ]
+if [ "`uname -s`" = "Darwin" ]
 then
-  LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
+  if [ -n "$DYLD_LIBRARY_PATH" ]
+  then
+    DYLD_LIBRARY_PATH="$topdir/libs:$DYLD_LIBRARY_PATH"
+  else
+    DYLD_LIBRARY_PATH="$topdir/libs"
+  fi
+  export DYLD_LIBRARY_PATH
 else
-  LD_LIBRARY_PATH="$topdir/libs"
+  if [ -n "$LD_LIBRARY_PATH" ]
+  then
+    LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
+  else
+    LD_LIBRARY_PATH="$topdir/libs"
+  fi
+  export LD_LIBRARY_PATH
 fi
+
 if [ -n "$WINEDLLPATH" ]
 then
   WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH"
@@ -76,7 +89,7 @@ else
 fi
 WINESERVER="$topdir/server/wineserver"
 WINELOADER="$topdir/loader/wine"
-export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER
+export WINEDLLPATH WINESERVER WINELOADER
 
 # any local settings ?
 if [ -f "$topdir/.winewrapper" ]