configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader.

This provides better backwards compatibility when running with a
32-bit prefix.
diff --git a/configure.ac b/configure.ac
index 4224e37..df70de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1734,7 +1734,7 @@
 esac
 
 AC_SUBST(MAIN_BINARY,"wine")
-test -z "$with_wine64" || MAIN_BINARY="wine32"
+test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64"
 
 case $host_cpu in
   *i[[3456789]]86*)
@@ -2753,13 +2753,13 @@
 if test -n "$with_wine64"
 then
 WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
-[all: fonts server $with_wine64/loader/wine32
+[all: fonts server $with_wine64/loader/wine
 fonts server:
 	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
-$with_wine64/loader/wine32:
-	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@]
+$with_wine64/loader/wine:
+	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
 clean::
-	\$(RM) fonts server $with_wine64/loader/wine32])
+	\$(RM) fonts server $with_wine64/loader/wine])
 fi
 
 WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],