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.

7 files changed, 25 insertions, 25 deletions

diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index 64f22d725a8f..b1f63d46da61 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -21,12 +21,12 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 pre-install:
-	${ECHO} bin/aewm > ${PLIST}
+	${ECHO_CMD} bin/aewm > ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in ${DOCS}; \
-		do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
 	done
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 4f60ddbc8ba2..fcc27c5d6029 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -33,7 +33,7 @@ do-build:
 do-install:
 .for i in ${SUB_STUBS}
 	@cd ${WRKDIR}/${i} ; \
-	${INSTALL_PROGRAM} `${ECHO} '${i}' | ${SED} -e 's,-\(.*\),,'` \
+	${INSTALL_PROGRAM} `${ECHO_CMD} '${i}' | ${SED} -e 's,-\(.*\),,'` \
 	${PREFIX}/bin
 .endfor
 
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 512fabc7c88a..179aa8f4ddb2 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -27,12 +27,12 @@ do-build:
 		-L${X11BASE}/lib -o evilwm *.c -lX11
 
 pre-install:
-	${ECHO} bin/evilwm > ${PLIST}
+	${ECHO_CMD} bin/evilwm > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/${i} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index 7ab1087c6a3a..786650ea2754 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -36,23 +36,23 @@ post-patch:
 		 s|^MOC|#MOC|g'
 
 pre-install:
-	${ECHO} bin/qlwm > ${PLIST}
+	${ECHO_CMD} bin/qlwm > ${PLIST}
 .for i in biff dclock qlwm
-	${ECHO} ${LIBDIR}/$i >> ${PLIST}
+	${ECHO_CMD} ${LIBDIR}/$i >> ${PLIST}
 .endfor
-	for i in `cd ${WRKSRC}/files; ${ECHO} *`; do \
-		${ECHO} ${LIBDIR}/files/$$i >> ${PLIST}; \
+	for i in `cd ${WRKSRC}/files; ${ECHO_CMD} *`; do \
+		${ECHO_CMD} ${LIBDIR}/files/$$i >> ${PLIST}; \
 	done
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/$i >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST}
 .endfor
 .endif
 .for i in ${LIBDIR}/files ${LIBDIR}
-	${ECHO} @dirrm $i >> ${PLIST}
+	${ECHO_CMD} @dirrm $i >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index a4e54e8bc638..66c31f0320ca 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -29,21 +29,21 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
 pre-install:
 	${RM} -f ${PLIST}
 	for i in ${BINS} ${SCRIPTS}; \
-		do ${ECHO} bin/$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} bin/$${i} >> ${PLIST}; \
 	done
 .if !defined(NOPORTDOCS)
 	for i in ${DOCS}; \
-		do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
 	done
 	for i in 1 2 3; \
-		do ${ECHO} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \
 	done
 	for i in ${EXAMPLES}; \
-		do ${ECHO} ${DOCDIR}/examples/$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/examples/$${i} >> ${PLIST}; \
 	done
-	${ECHO} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR}/examples >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR}/examples >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11-wm/uwm/Makefile b/x11-wm/uwm/Makefile
index a15814e4a13a..7334a964e584 100644
--- a/x11-wm/uwm/Makefile
+++ b/x11-wm/uwm/Makefile
@@ -24,9 +24,9 @@ post-patch:
 	${PERL} -pi -e 's:/usr/lib/X11:${PREFIX}/lib/X11:g' ${WRKSRC}/uwm.man
 
 pre-install:
-	${ECHO} bin/uwm > ${PLIST}
-	${ECHO} lib/X11/uwm/system.uwmrc >> ${PLIST}
-	${ECHO} @dirrm lib/X11/uwm >> ${PLIST}
+	${ECHO_CMD} bin/uwm > ${PLIST}
+	${ECHO_CMD} lib/X11/uwm/system.uwmrc >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/X11/uwm >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/X11/uwm
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 49df01587287..c0a41c2a38d9 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -76,6 +76,6 @@ post-install:
 
 update-LINGUAS: extract
 	cd ${WRKSRC}/po && \
-		${ECHO} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
+		${ECHO_CMD} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
 
 .include <bsd.port.post.mk>