diff --git a/configure b/configure index 3c235e3edc2..63f463364d2 100755 --- a/configure +++ b/configure @@ -20188,15 +20188,21 @@ fi if test -n "$with_wine64" then - wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader + case "$with_wine64" in + /*) reldir="" ;; + *) reldir="../" ;; + esac + wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ +loader/wine64 loader/wine64-preloader: + \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else WINELOADER_INSTALL="wine.inf l_intl.nls" diff --git a/configure.ac b/configure.ac index 294fe4ba893..39cabf25884 100644 --- a/configure.ac +++ b/configure.ac @@ -4058,16 +4058,22 @@ fi if test -n "$with_wine64" then + case "$with_wine64" in + /*) reldir="" ;; + *) reldir="../" ;; + esac WINE_APPEND_RULE( -[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader +[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] +loader/wine64 loader/wine64-preloader: + \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") case $host_os in diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index abf33df2a25..26c576e4f0f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1958,7 +1958,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) { diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 623bf653970..2ff8610ccee 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -976,7 +976,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) {