[SVN-Commit] r862 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jul  9 14:05:18 2012
New Revision: 862

Log:
make LIGHTNING objdir safe

Submitted by:	flo

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Mon Jul  9 14:05:05 2012	(r861)
+++ branches/experimental/Mk/bsd.gecko.mk	Mon Jul  9 14:05:18 2012	(r862)
@@ -802,6 +802,8 @@
 CONFIGURE_WRKSRC=${MOZ_OBJDIR}
 BUILD_WRKSRC=	${MOZ_OBJDIR}
 INSTALL_WRKSRC=	${MOZ_OBJDIR}
+.else
+MOZ_OBJDIR=		${WRKSRC}
 .endif
 
 .else # bsd.port.post.mk

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Mon Jul  9 14:05:05 2012	(r861)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Mon Jul  9 14:05:18 2012	(r862)
@@ -87,7 +87,7 @@
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning at thunderbird.mozilla.org

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Mon Jul  9 14:05:05 2012	(r861)
+++ branches/experimental/mail/thunderbird/Makefile	Mon Jul  9 14:05:18 2012	(r862)
@@ -87,7 +87,7 @@
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning at thunderbird.mozilla.org

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Mon Jul  9 14:05:05 2012	(r861)
+++ branches/experimental/www/seamonkey/Makefile	Mon Jul  9 14:05:18 2012	(r862)
@@ -107,7 +107,7 @@
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning at seamonkey.mozilla.org