Commit 4ee9bbc8 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 56b14d63
...@@ -426,14 +426,15 @@ static int set_dlldir( char *libdir ) ...@@ -426,14 +426,15 @@ static int set_dlldir( char *libdir )
/* initialize the argv0 path */ /* initialize the argv0 path */
void wine_init_argv0_path( const char *argv0 ) void wine_init_argv0_path( const char *argv0 )
{ {
const char *basename; const char *basename, *wineloader;
if (!(basename = strrchr( argv0, '/' ))) basename = argv0; if (!(basename = strrchr( argv0, '/' ))) basename = argv0;
else basename++; else basename++;
if (set_bindir( get_runtime_exedir() )) goto done; if (set_bindir( get_runtime_exedir() )) goto done;
if (set_dlldir( get_runtime_libdir() )) 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: done:
if (build_dir) if (build_dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment