Alexandre Julliard : makefiles: Disable binary installation in the individual makefiles on Wow64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d5f316bf0a9a6e78e1b096c7b82365fa4b23303e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d5f316bf0a9a6e78e1b096c7b82365fa4b23303e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 22 14:15:08 2018 +0100

makefiles: Disable binary installation in the individual makefiles on Wow64.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 Makefile.in                      | 1 +
 configure                        | 3 +++
 configure.ac                     | 1 +
 programs/msiexec/Makefile.in     | 2 +-
 programs/notepad/Makefile.in     | 2 +-
 programs/regedit/Makefile.in     | 2 +-
 programs/regsvr32/Makefile.in    | 2 +-
 programs/wineboot/Makefile.in    | 2 +-
 programs/winecfg/Makefile.in     | 2 +-
 programs/wineconsole/Makefile.in | 2 +-
 programs/winedbg/Makefile.in     | 2 +-
 programs/winefile/Makefile.in    | 2 +-
 programs/winemine/Makefile.in    | 2 +-
 programs/winepath/Makefile.in    | 2 +-
 14 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6a152ae..4738d79 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,7 @@ dlldir          = ${libdir}/wine
 top_srcdir      = @top_srcdir@
 top_builddir    = @top_builddir@
 srcdir          = @srcdir@
+wine64_disable  = @wine64_disable@
 SHELL           = /bin/sh
 RM              = rm -f
 MV              = mv
diff --git a/configure b/configure
index 41cb3bb..a0713c0 100755
--- a/configure
+++ b/configure
@@ -757,6 +757,7 @@ AR
 BISON
 FLEX
 TOOLSDIR
+wine64_disable
 TARGETFLAGS
 LD
 CPPBIN
@@ -5371,6 +5372,8 @@ then
 You should create a separate build directory and run configure from there." "$LINENO" 5
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
+    wine64_disable=\#
+
 elif test "x$enable_win64" = "xyes"
 then
     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
diff --git a/configure.ac b/configure.ac
index 0fb6863..e72efce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,7 @@ then
 You should create a separate build directory and run configure from there.])
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
+    AC_SUBST(wine64_disable,[\#])
 elif test "x$enable_win64" = "xyes"
 then
     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index 7686b10..73a6d26 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -12,4 +12,4 @@ MANPAGES = msiexec.man.in
 
 SVG_SRCS = msiexec.svg
 
-INSTALL_LIB = msiexec.exe msiexec
+INSTALL_LIB = msiexec.exe $(wine64_disable)msiexec
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index e5d39a8..28e3710 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -12,4 +12,4 @@ MANPAGES = notepad.man.in
 
 SVG_SRCS = notepad.svg
 
-INSTALL_LIB = notepad.exe notepad
+INSTALL_LIB = notepad.exe $(wine64_disable)notepad
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 54f00f7..78981bf 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -21,4 +21,4 @@ MANPAGES = regedit.man.in
 
 SVG_SRCS = regedit.svg
 
-INSTALL_LIB = regedit.exe regedit
+INSTALL_LIB = regedit.exe $(wine64_disable)regedit
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index e91f206..25434bf 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -9,4 +9,4 @@ RC_SRCS = regsvr32.rc
 
 MANPAGES = regsvr32.man.in
 
-INSTALL_LIB = regsvr32.exe regsvr32
+INSTALL_LIB = regsvr32.exe $(wine64_disable)regsvr32
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 419ec16..2006067 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -11,4 +11,4 @@ RC_SRCS = wineboot.rc
 
 MANPAGES = wineboot.man.in
 
-INSTALL_LIB = wineboot.exe wineboot
+INSTALL_LIB = wineboot.exe $(wine64_disable)wineboot
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 7b52a69..d516778 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -23,4 +23,4 @@ SVG_SRCS = \
 	logo.svg \
 	winecfg.svg
 
-INSTALL_LIB = winecfg.exe winecfg
+INSTALL_LIB = winecfg.exe $(wine64_disable)winecfg
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index b1ba9ef..cc131e3 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -14,4 +14,4 @@ RC_SRCS = wineconsole.rc
 
 MANPAGES = wineconsole.man.in
 
-INSTALL_LIB = wineconsole.exe wineconsole
+INSTALL_LIB = wineconsole.exe $(wine64_disable)wineconsole
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index ff75874..194a30c 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -35,4 +35,4 @@ BISON_SRCS = dbg.y
 
 MANPAGES = winedbg.man.in
 
-INSTALL_LIB = winedbg.exe winedbg
+INSTALL_LIB = winedbg.exe $(wine64_disable)winedbg
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index 5106718..06fd218 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -13,4 +13,4 @@ MANPAGES = winefile.man.in
 
 SVG_SRCS = winefile.svg
 
-INSTALL_LIB = winefile.exe winefile
+INSTALL_LIB = winefile.exe $(wine64_disable)winefile
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index ea9b9d3..bd7bdb6 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -13,4 +13,4 @@ MANPAGES = winemine.man.in
 
 SVG_SRCS = winemine.svg
 
-INSTALL_LIB = winemine.exe winemine
+INSTALL_LIB = winemine.exe $(wine64_disable)winemine
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index ca28e30..176388b 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -5,4 +5,4 @@ C_SRCS = winepath.c
 
 MANPAGES = winepath.man.in
 
-INSTALL_LIB = winepath.exe winepath
+INSTALL_LIB = winepath.exe $(wine64_disable)winepath