Alexandre Julliard : configure: Fix the bin install rule in wow64 mode.
Alexandre Julliard
julliard at winehq.org
Tue Jan 4 09:47:25 CST 2011
Module: wine
Branch: master
Commit: c1e29580ed02c3716c7106b1ff589f59383ea2ed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e29580ed02c3716c7106b1ff589f59383ea2ed
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jan 3 18:28:27 2011 +0100
configure: Fix the bin install rule in wow64 mode.
---
aclocal.m4 | 2 +-
configure | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 264aed6..0cd5608 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -344,7 +344,7 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE) install
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"
- if wine_fn_has_flag installbin $ac_flags -a -n "$DLLEXT" -a "x$enable_tools" != xno
+ if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: tools \$(DESTDIR)\$(bindir)
diff --git a/configure b/configure
index c9dac48..771ccba 100755
--- a/configure
+++ b/configure
@@ -14602,7 +14602,7 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE) install
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"
- if wine_fn_has_flag installbin $ac_flags -a -n "$DLLEXT" -a "x$enable_tools" != xno
+ if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: tools \$(DESTDIR)\$(bindir)
More information about the wine-cvs
mailing list