Module: wine Branch: master Commit: a5aaa41069fab4719ec84cea790d69b7710c701c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5aaa41069fab4719ec84cea7...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Apr 28 11:41:27 2021 +0200
makefiles: Install libwine into the architecture-specific directory.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 1 - configure.ac | 1 - dlls/ntdll/unix/loader.c | 2 +- tools/makedep.c | 6 ++---- 4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure b/configure index d22c0cf89cc..e1699b7e765 100755 --- a/configure +++ b/configure @@ -5868,7 +5868,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 - test "x$libdir" != "x${exec_prefix}/lib" || libdir="${exec_prefix}/lib64" fi
case $host_cpu in diff --git a/configure.ac b/configure.ac index c90e78d8bb7..ebe9497522c 100644 --- a/configure.ac +++ b/configure.ac @@ -235,7 +235,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) - test "x$libdir" != "x${exec_prefix}/lib" || libdir="${exec_prefix}/lib64" fi
dnl Normalize CPU architecture diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a575fb21b76..e4c062cea98 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -977,7 +977,7 @@ static void load_libwine(void) void *handle;
if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); - else path = build_path( dll_dir, "../" LIBWINE ); + else path = build_path( ntdll_dir, LIBWINE );
handle = dlopen( path, RTLD_NOW ); free( path ); diff --git a/tools/makedep.c b/tools/makedep.c index 638af2b6a44..f19ddfc6b74 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3525,14 +3525,12 @@ static void output_shared_lib( struct makefile *make ) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - add_install_rule( make, make->sharedlib, make->sharedlib, - strmake( "p$(libdir)/%s", make->sharedlib )); + add_install_rule( make, make->sharedlib, make->sharedlib, strmake( "p%s/%s", so_dir, make->sharedlib )); for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], names.str[i-1], - strmake( "y$(libdir)/%s", names.str[i] )); + add_install_rule( make, names.str[i], names.str[i-1], strmake( "y%s/%s", so_dir, names.str[i] )); } strarray_addall( &make->all_targets, names ); }