wine64: Use a single build stage for wine32 and wine64

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Jul 11 16:29:26 2019 +0200
Changeset:	2fa7c7ae7fb59db3435d5d70325ba4c79ee4b3b8

Modified Files:
	wine64/Makefile

Log Message:
wine64: Use a single build stage for wine32 and wine64

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2fa7c7ae7fb59db3435d5d70325ba4c79ee4b3b8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wine64/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index 4356ab66b2..6f84ee663e 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -31,11 +31,9 @@ NOT_PAX_MPROTECT_SAFE+=	bin/wine
 BUILD32=		${WRKSRC}/wine32
 BUILD64=		${WRKSRC}/wine64
 
-build-wine64:
+do-build:
 	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
-
-build-wine32:
-	cd ${BUILD32} && ${SETENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
+	cd ${BUILD32} && ${SETENV} ${WINE32_ENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
 
 do-install:
 	cd ${BUILD32} && ${INSTALL_ENV} ${MAKE} install
@@ -45,8 +43,6 @@ post-extract:
 	${MKDIR} ${BUILD32}
 	${MKDIR} ${BUILD64}
 
-do-build: build-wine64 build-wine32
-
 do-configure:
 	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE64_ARGS}
 	cd ${BUILD32} && ${SETENV} ${WINE32_ENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE32_ARGS}