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

makefiles: Install PE files in an architecture-specific directory.

Browse Source 
Based on a patch by Jacek Caban.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-04-26 14:45:32 +02:00
parent f14632f345
commit c59126d403
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls
dlldir = ${libdir}/wine
srcdir = @srcdir@
SHELL = /bin/sh
ARCH = @ARCH@
CC = @CC@
CXX = @CXX@
CPPBIN = @CPPBIN@

14
configure vendored
View File

@ -775,6 +775,7 @@ AR
BISON
FLEX
TOOLSDIR
ARCH
TARGETFLAGS
LD
CPPBIN
@ -5870,6 +5871,19 @@ then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
fi
case $host_cpu in
*i[3456789]86*) ARCH="i386"
;;
*x86_64*) ARCH="x86_64"
;;
*aarch64*) ARCH="aarch64"
;;
*arm*) ARCH="arm"
;;
*) ARCH=""
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
$as_echo_n "checking for the directory containing the Wine tools... " >&6; }
if ${wine_cv_toolsdir+:} false; then :

9
configure.ac
View File

@ -238,6 +238,15 @@ then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
fi
dnl Normalize CPU architecture
case $host_cpu in
*i[[3456789]]86*) AC_SUBST(ARCH,"i386") ;;
*x86_64*) AC_SUBST(ARCH,"x86_64") ;;
*aarch64*) AC_SUBST(ARCH,"aarch64") ;;
*arm*) AC_SUBST(ARCH,"arm") ;;
*) AC_SUBST(ARCH,"") ;;
esac
AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
[wine_cv_toolsdir="$with_wine_tools"
if test -z "$with_wine_tools"; then

9
tools/makedep.c
View File

@ -158,6 +158,8 @@ static const char *tools_ext;
static const char *exe_ext;
static const char *dll_ext;
static const char *man_ext;
static const char *arch;
static const char *pe_dir;
static const char *crosstarget;
static const char *crossdebug;
static const char *fontforge;
@ -3321,7 +3323,7 @@ static void output_module( struct makefile *make )
}
strarray_add( &make->all_targets, strmake( "%s", make->module ));
add_install_rule( make, make->module, strmake( "%s", make->module ),
strmake( "c$(dlldir)/%s", make->module ));
strmake( "c%s/%s", pe_dir, make->module ));
debug_file = get_debug_file( make, make->module );
output( "%s:", module_path );
}
@ -4434,6 +4436,7 @@ int main( int argc, char *argv[] )
exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" );
man_ext = get_expanded_make_variable( top_makefile, "api_manext" );
dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so";
arch = get_expanded_make_variable( top_makefile, "ARCH" );
crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" );
crossdebug = get_expanded_make_variable( top_makefile, "CROSSDEBUG" );
fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" );
@ -4454,6 +4457,10 @@ int main( int argc, char *argv[] )
if (!exe_ext) exe_ext = "";
if (!tools_ext) tools_ext = "";
if (!man_ext) man_ext = "3w";
if (arch)
pe_dir = strmake( "$(dlldir)/%s-windows", arch );
else
pe_dir = "$(dlldir)";
top_makefile->src_dir = root_src_dir;
subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );