From 5b243306947e74184be0fc39cd0f0d1eb8063940 Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 29 Jan 2002 11:48:57 +0000 Subject: Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command; the ECHO macro is set to "echo" by default, but it is set to "true" if make(1) is invoked with the -s option while ECHO_CMD is always set to the echo command. --- mail/postfix24/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mail/postfix24') diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 9a23d6b607b..0093acf6de5 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ -- cgit