[SVN-Commit] r1738 - trunk/Mk

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Oct 21 11:50:50 2014
New Revision: 1738

Log:
revert r1300 and try different approach

PR:		ports/194490

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Oct 18 21:32:14 2014	(r1737)
+++ trunk/Mk/bsd.gecko.mk	Tue Oct 21 11:50:50 2014	(r1738)
@@ -109,9 +109,10 @@
 MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 			${MOZILLA}-xpcom ${MOZILLA}-plugin
 
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MOZ_EXPORT+=	${CONFIGURE_ENV} \
 				PERL="${PERL}"
-MOZ_OPTIONS+=	--prefix="${PREFIX}"
+MOZ_OPTIONS+=	${CONFIGURE_TARGET} --prefix="${PREFIX}"
 
 CPPFLAGS+=		-isystem${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA}
@@ -428,7 +429,6 @@
 MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
 
 .if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-unknown-${OPSYS:tl}${OSREL}
 . if ${USE_MOZILLA:M-nss}
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin