Avoid the name "build" for the OBJDIR, use obj.${MACHINE_ARCH} instead

[Martin Husemann <martin%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Martin Husemann <martin%NetBSD.org@localhost>
Pushed By:	martin
Date:		Fri Nov 11 18:00:36 2016 +0100
Changeset:	b7fe6894bba6eb570372f49e4cd94d969f9829fb

Modified Files:
	firefox-hg/mozilla-common.mk

Log Message:
Avoid the name "build" for the OBJDIR, use obj.${MACHINE_ARCH} instead

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

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

diffstat:
 firefox-hg/mozilla-common.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diffs:
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index c9e6c32..fc02143 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -76,11 +76,13 @@ SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
 SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
 
-CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.guess
+MOZ_OBJDIR=obj.${MACHINE_ARCH}
+
+CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}${MOZ_OBJDIR}/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}/js/ctypes/libffi/config.guess
-CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}${MOZ_OBJDIR}/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}/js/ctypes/libffi/config.sub
@@ -95,7 +97,7 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 
 # Build outside ${WRKSRC}
 # Try to avoid conflict with config/makefiles/xpidl/Makefile.in
-OBJDIR=			../build
+OBJDIR=			../${MOZ_OBJDIR}
 CONFIGURE_DIRS=		${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}/configure