[SVN-Commit] r1012 - trunk/Mk

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Sep 12 09:51:16 2012
New Revision: 1012

Log:
respect LOCALBASE when looking for system extensions

  /usr/local/lib/extensions
  /usr/local/share/extensions

Not to be confused with /usr/local/lib/xpi where xpi-* ports install.

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Sep 12 09:51:09 2012	(r1011)
+++ trunk/Mk/bsd.gecko.mk	Wed Sep 12 09:51:16 2012	(r1012)
@@ -863,6 +863,8 @@
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
 		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
+	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
+		${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp
 	@${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/'
 .if ${MOZILLA} != "kompozer"