Module: wine Branch: master Commit: 00538ed195b78a73a7fe4aebdf7dd4577d954dbc URL: https://gitlab.winehq.org/wine/wine/-/commit/00538ed195b78a73a7fe4aebdf7dd45...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 25 12:10:24 2023 +0200
configure: Don't create the wine64 symlink in multi-arch builds.
---
configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index ee24e91136a..bc130a5fc00 100755 --- a/configure +++ b/configure @@ -21090,7 +21090,7 @@ test "$srcdir" = . || wine_srcdir="$srcdir/"
ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine -if test "$HOST_ARCH" = x86_64 -o -n "$with_wine64"; then +if test "$wine_binary" = wine64 -o -n "$with_wine64"; then ac_config_links="$ac_config_links wine64:tools/winewrapper" wine_fn_config_symlink wine64 fi diff --git a/configure.ac b/configure.ac index 0a6171e7fd3..3af0aa5fa98 100644 --- a/configure.ac +++ b/configure.ac @@ -2330,7 +2330,7 @@ wine_srcdir= test "$srcdir" = . || wine_srcdir="$srcdir/"
WINE_CONFIG_SYMLINK(wine,tools/winewrapper) -WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["$HOST_ARCH" = x86_64 -o -n "$with_wine64"]) +WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["$wine_binary" = wine64 -o -n "$with_wine64"])
WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui)