[SVN-Commit] r240 - branches/experimental/Mk trunk/Mk

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Thu Jan 21 10:43:57 2010
New Revision: 240

Log:
- Fix installation of ports where MOZSRC != WRKSRC

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   trunk/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Wed Jan 20 22:16:50 2010	(r239)
+++ branches/experimental/Mk/bsd.gecko.mk	Thu Jan 21 10:43:57 2010	(r240)
@@ -562,7 +562,7 @@
 .if !defined(NOGECKO_PLIST)
 	@${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF}
 	@${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF}
-	@cd ${MOZSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
 .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
 	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Jan 20 22:16:50 2010	(r239)
+++ trunk/Mk/bsd.gecko.mk	Thu Jan 21 10:43:57 2010	(r240)
@@ -82,7 +82,8 @@
 		libxul
 
 thunderbird_PORTSDIR=	mail
-libxul_PLIST=		${LOCALBASE}/lib/libxul/libxul.so
+libxul_PLIST=		${LOCALBASE}/lib/libxul/libxul.so 
+seamonkey_PLIST=	${LOCALBASE}/lib/seamonkey/libxul.so 
 
 .for gecko in ${_GECKO_ALL}
 ${gecko}_PORTSDIR?=	www
@@ -561,7 +562,7 @@
 .if !defined(NOGECKO_PLIST)
 	@${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF}
 	@${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF}
-	@cd ${MOZSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
 .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
 	${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}