From 62beaad8737b7aac7acc2352933c02e33c1aa9ba Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 7 Oct 2013 13:12:25 +0200
Subject: [PATCH] configure: Correctly install binaries even when the tools are
 disabled.

---
 aclocal.m4 | 14 +++++++-------
 configure  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 5240a52791a..3de919946e3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__"
 $ac_dir/__uninstall__::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
 
-        if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
+        if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags
         then
             wine_fn_append_rule \
-"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir)
-	\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
+"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir)
+	\$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
 $ac_dir/__uninstall__::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
         fi
     else
         wine_fn_append_rule \
-"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
-	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program
+"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir)
+	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
 $ac_dir/__uninstall__::
-	\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program"
+	\$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
     fi
 
-    if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags
+    if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags
     then
         wine_fn_append_rule \
 "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
diff --git a/configure b/configure
index b53ae917894..56f2fabc4b2 100755
--- a/configure
+++ b/configure
@@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__"
 $ac_dir/__uninstall__::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
 
-        if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
+        if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags
         then
             wine_fn_append_rule \
-"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir)
-	\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
+"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir)
+	\$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
 $ac_dir/__uninstall__::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
         fi
     else
         wine_fn_append_rule \
-"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
-	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program
+"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir)
+	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
 $ac_dir/__uninstall__::
-	\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program"
+	\$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
     fi
 
-    if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags
+    if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags
     then
         wine_fn_append_rule \
 "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)