configure: Rename the main binary to "wine32" for the Wow64 build.
diff --git a/configure b/configure
index 06d06ee..12469cb 100755
--- a/configure
+++ b/configure
@@ -609,6 +609,7 @@
LIBPOLL
LIBDL
EXTRA_BINARIES
+MAIN_BINARY
SOCKETLIBS
CRTLIBS
LDPATH
@@ -11718,6 +11719,10 @@
;;
esac
+MAIN_BINARY="wine"
+
+test -z "$with_wine64" || MAIN_BINARY="wine32"
+
case $host_cpu in
*i[3456789]86*)
case $host_os in
diff --git a/configure.ac b/configure.ac
index a38c525..e186872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1595,6 +1595,9 @@
;;
esac
+AC_SUBST(MAIN_BINARY,"wine")
+test -z "$with_wine64" || MAIN_BINARY="wine32"
+
case $host_cpu in
*i[[3456789]]86*)
case $host_os in
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 9bef13f..8f4d2a2 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -2,12 +2,12 @@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = wine
C_SRCS = \
main.c \
preloader.c
+MAIN_BINARY = @MAIN_BINARY@
EXTRA_BINARIES = @EXTRA_BINARIES@
PROGRAMS = \
@@ -48,7 +48,7 @@
.PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%)
install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%)
- $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MODULE)
+ $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY)
@WOW64_DISABLE@ install install-lib:: install-man-pages
@@ -58,7 +58,7 @@
$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
uninstall::
- -cd $(DESTDIR)$(bindir) && $(RM) $(EXTRA_BINARIES) $(MODULE)
+ -cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES)
$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
$(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
$(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
