Date: Fri, 22 Jun 2012 01:30:54 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r789 - branches/experimental/Mk Message-ID: <201206220130.q5M1UsKs005400@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 22 01:30:54 2012
New Revision: 789
Log:
followup to r783, lump together similar substitutions
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:13:27 2012 (r788)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 01:30:54 2012 (r789)
@@ -782,26 +782,24 @@
${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
fi
.endfor
- @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
- ${WRKSRC}/config/autoconf.mk.in
- @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
- s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
- ${MOZSRC}/security/coreconf/FreeBSD.mk \
- ${MOZSRC}/js/src/Makefile.in
- @if [ -d ${WRKSRC}/directory/c-sdk ]; then \
- ${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
+ @for f in \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
- ${WRKSRC}/directory/c-sdk/configure ; \
- fi
- @-if [ -f ${WRKSRC}/configure ] ; then \
- ${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
- s|-lpthread|${PTHREAD_LIBS}|g ; \
- s|echo aout|echo elf|g ; \
- s|/usr/X11R6|${LOCALBASE}|g' \
+ ${WRKSRC}/directory/c-sdk/configure \
+ ${MOZSRC}/security/coreconf/FreeBSD.mk \
+ ${MOZSRC}/js/src/Makefile.in \
${MOZSRC}/js/src/configure \
${MOZSRC}/configure \
- ${WRKSRC}/configure; \
- fi
+ ${WRKSRC}/configure; do \
+ if [ -f $$f ] ; then \
+ ${REINPLACE_CMD} -Ee 's|-lc_r|${PTHREAD_LIBS}|g ; \
+ s|-l?pthread|${PTHREAD_LIBS}|g ; \
+ s|echo aout|echo elf|g ; \
+ s|/usr/X11R6|${LOCALBASE}|g' \
+ $$f; \
+ fi; \
+ done
+ @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+ ${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206220130.q5M1UsKs005400>