Hi,

I think the following patch would fix the problem.

Regards,
Balint
diff -Naur wine-0.9.53.orig-notfixed/programs/winelauncher.in wine-0.9.53.orig/programs/winelauncher.in
--- wine-0.9.53.orig-notfixed/programs/winelauncher.in	2008-02-14 19:59:13.000000000 +0100
+++ wine-0.9.53.orig/programs/winelauncher.in	2008-02-15 16:33:18.000000000 +0100
@@ -36,9 +36,12 @@
 #------------------------------------------------------------------------------
 [EMAIL PROTECTED]@/wine
 [EMAIL PROTECTED]@
-WINESERVER=
[EMAIL PROTECTED]@
-
+WINESERVER=$WINESERVER
+if [ -z "$WINEDLLPATH" ]; then
+    [EMAIL PROTECTED]@
+else
+    WINEDLLPATH=$WINEDLLPATH:@dlldir@
+fi
 #------------------------------------------------------------------------------
 #  Establish Color Scheme
 #------------------------------------------------------------------------------
@@ -178,23 +181,14 @@
     WINELIB=`find $argv0_dir/../ -maxdepth 2 -name 'libwine.so.1' -printf "%h\n" | head -n 1`
 fi
 
-if [ -x $WINEBIN/wineserver ] ; then
+if [ -x $WINEBIN/wineserver -a -z "$WINESERVER" ] ; then
     WINESERVER=$WINEBIN/wineserver
 fi
 
-#------------------------------------------------------------------------------
-#  Hey, if we built Wine from source, let's add a little extra fun to
-#   mix it up a bit
-#------------------------------------------------------------------------------
-if [ -x $WINEBIN/server/wineserver ] ; then
-    WINESERVER=$WINEBIN/server/wineserver
-fi
-
-if [ -r $WINELIB/dlls/ntdll.dll.so ] ; then
-    WINEDLLPATH=$WINELIB/dlls
+if [ -z "$WINELOADER" ]; then
+    WINELOADER=$WINEBIN/$WINE_BIN_NAME
 fi
 
-
 #------------------------------------------------------------------------------
 #  Okay, set the paths and move on.
 #------------------------------------------------------------------------------
@@ -204,7 +198,7 @@
 	export LD_LIBRARY_PATH=$WINELIB
 fi
 export PATH=$WINEBIN:$PATH
-export WINELOADER=$WINEBIN/$WINE_BIN_NAME
+export WINELOADER
 export WINEDLLPATH
 export WINESERVER
 

Reply via email to