ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Install libwine into the architecture-specific directory. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-04-28 11:41:27 +02:00
parent 2801d6341c
commit a5aaa41069
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -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

1
configure.ac
View File

@ -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

2
dlls/ntdll/unix/loader.c
View File

@ -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 );

6
tools/makedep.c
View File

@ -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 );
}