Date: Fri, 23 Mar 2012 07:26:51 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r705 - branches/experimental/Mk Message-ID: <201203230726.q2N7Qp5f002664@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Fri Mar 23 07:26:50 2012
New Revision: 705
Log:
- Make the nsDeviceContextSpecG.cpp check work in a reliable way. For the
sake of consistency also change the nsSound.cpp check.
Reported by: flo
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Mar 22 07:41:39 2012 (r704)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Mar 23 07:26:50 2012 (r705)
@@ -832,14 +832,14 @@
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh
-.if exists(${MOZSRC}/widget/src/gtk2/nsSound.cpp)
- @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
- ${MOZSRC}/widget/src/gtk2/nsSound.cpp
-.endif
-.if !exists(${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp)
- @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
- ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
-.endif
+ @if [ -f ${MOZSRC}/widget/src/gtk2/nsSound.cpp ] ; then \
+ ${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
+ ${MOZSRC}/widget/src/gtk2/nsSound.cpp ; \
+ fi
+ @if ! [ -f ${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp ] ; then \
+ ${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
+ ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp ; \
+ fi
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203230726.q2N7Qp5f002664>