From 90b0fa875406d83ee5fafeab81fa5386aa15d730 Mon Sep 17 00:00:00 2001 From: ahze Date: Wed, 23 Nov 2005 00:43:14 +0000 Subject: - Make post-patch quite - Detect PORT_MOZCONFIG if it's not ${FILESDIR}/mozconfig.in git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5185 df743ca5-7f9a-e211-a948-0013205c9059 --- www/mozilla/Makefile.common | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index d871e78c3..3a56cc93a 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.7 2005/11/17 18:18:08 marcus Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.8 2005/11/22 21:29:15 ahze Exp $ # Ports can use the following: # @@ -212,17 +212,17 @@ gecko-post-patch: .if exists(${GENERIC_MOZCONFIG}) @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG} .endif -.if exists(${PORT_MOZCONFIG}) - @${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} -.endif + @if [ -e ${PORT_MOZCONFIG} ] ; then \ + ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ + fi .for arg in ${MOZ_OPTIONS} - ${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG} + @${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG} .endfor .for arg in ${MOZ_MK_OPTIONS} - ${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG} + @${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG} .endfor .for var in ${MOZ_EXPORT} - ${ECHO_CMD} "export ${var}" >> ${MOZCONFIG} + @${ECHO_CMD} "export ${var}" >> ${MOZCONFIG} .endfor .endif # .if !defined(NOMOZCONFIG) @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ -- cgit v1.2.3