From 5b243306947e74184be0fc39cd0f0d1eb8063940 Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
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.

---
 news/newsfetch/Makefile      | 6 +++---
 news/t-gnus-emacs20/Makefile | 2 +-
 news/t-gnus/Makefile         | 2 +-
 news/tin/Makefile            | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'news')

diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index 5171279c821d..d201bbca1e8a 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -20,9 +20,9 @@ MANCOMPRESSED=	maybe
 
 do-configure:
 	cd ${WRKSRC} && ( \
-	${ECHO} "PROG= newsfetch"; \
-	${ECHO} "SRCS=" *.c; \
-	${ECHO} ".include <bsd.prog.mk>"; \
+	${ECHO_CMD} "PROG= newsfetch"; \
+	${ECHO_CMD} "SRCS=" *.c; \
+	${ECHO_CMD} ".include <bsd.prog.mk>"; \
 	) > Makefile
 
 .include <bsd.port.mk>
diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile
index e3c5f8e174b8..9b2f1e80bd74 100644
--- a/news/t-gnus-emacs20/Makefile
+++ b/news/t-gnus-emacs20/Makefile
@@ -79,7 +79,7 @@ PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 
 .if (${EMACS_PORT_NAME} == "mule")
 post-extract:
-	${ECHO} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel
+	${ECHO_CMD} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel
 	${CHMOD} +x ${WRKDIR}/mule-apel
 .endif
 
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index e3c5f8e174b8..9b2f1e80bd74 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -79,7 +79,7 @@ PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 
 .if (${EMACS_PORT_NAME} == "mule")
 post-extract:
-	${ECHO} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel
+	${ECHO_CMD} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel
 	${CHMOD} +x ${WRKDIR}/mule-apel
 .endif
 
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 9f104a9dfc0d..477d07eba199 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -59,11 +59,11 @@ pre-configure:
 
 post-configure:
 	if nm /usr/lib/libc.a | ${GREP} -q strcasestr; then \
-		${ECHO} "#define HAVE_STRCASESTR 1" \
+		${ECHO_CMD} "#define HAVE_STRCASESTR 1" \
 			>> ${WRKSRC}/include/autoconf.h; \
 	fi
-	${ECHO} "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h
-	${ECHO} "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h
+	${ECHO_CMD} "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h
+	${ECHO_CMD} "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h
 
 post-build:
 	cd ${WRKSRC}/po; ${GMAKE}
-- 
cgit