Alexandre Julliard : libwine: Fall back to the WINELOADER path for the bin directory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ee9bbc8891bbc866e0d6e012e09514433393df6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ee9bbc8891bbc866e0d6e012e...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Jun 26 13:38:00 2017 +0200

libwine: Fall back to the WINELOADER path for the bin directory.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/wine/config.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/wine/config.c b/libs/wine/config.c
index f85910b..13f016a 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -426,14 +426,15 @@ static int set_dlldir( char *libdir )
 /* initialize the argv0 path */
 void wine_init_argv0_path( const char *argv0 )
 {
-    const char *basename;
+    const char *basename, *wineloader;
 
     if (!(basename = strrchr( argv0, '/' ))) basename = argv0;
     else basename++;
 
     if (set_bindir( get_runtime_exedir() )) goto done;
     if (set_dlldir( get_runtime_libdir() )) goto done;
-    set_bindir( get_runtime_argvdir( argv0 ));
+    if (set_bindir( get_runtime_argvdir( argv0 ))) goto done;
+    if ((wineloader = getenv( "WINELOADER" ))) set_bindir( get_runtime_argvdir( wineloader ));
 
 done:
     if (build_dir)