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.

4 files changed, 8 insertions, 8 deletions

diff --git a/print/hugelatex/Makefile b/print/hugelatex/Makefile
index a9970919d270..d9db052fd083 100644
--- a/print/hugelatex/Makefile
+++ b/print/hugelatex/Makefile
@@ -26,7 +26,7 @@ do-install:
 	${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-hugelatex
 	${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF}
 	cd `dirname ${TEXMF_CNF}`; \
-	${ECHO} "" | ${PREFIX}/bin/latex -ini -fmt=hugelatex -progname=hugelatex latex.ini || ${TRUE}; \
+	${ECHO_CMD} "" | ${PREFIX}/bin/latex -ini -fmt=hugelatex -progname=hugelatex latex.ini || ${TRUE}; \
 	${RM} -f texsys.aux
 	${RM} -f ${PREFIX}/bin/hugelatex
 	${LN} -s latex ${PREFIX}/bin/hugelatex
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 9b3715fc62bd..b58603796b23 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -27,8 +27,8 @@ PKGMESSAGE=		${WRKDIR}/pkg-message
 post-patch: patch-makefile patch-message
 
 patch-makefile:
-	@${ECHO} all: betterdefault > ${WRKSRC}/Makefile.tmp
-	@${ECHO} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp
+	@${ECHO_CMD} all: betterdefault > ${WRKSRC}/Makefile.tmp
+	@${ECHO_CMD} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp
 	@${CAT} ${WRKSRC}/Makefile >> ${WRKSRC}/Makefile.tmp
 	@${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile
 
diff --git a/print/latex/Makefile b/print/latex/Makefile
index 22de61480d1c..f45bd9eb773d 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -51,8 +51,8 @@ do-install:
 	    if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done)
 	@(cd ${WRKSRC}/graphics; for f in *.sty *.tex *.def; do \
 	    if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done;\
-	    ${ECHO} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/graphics.cfg;\
-	    ${ECHO} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/color.cfg)
+	    ${ECHO_CMD} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/graphics.cfg;\
+	    ${ECHO_CMD} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/color.cfg)
 	@(cd ${WRKSRC}/psnfss; for f in *.sty *.tex; do \
 	    if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done;\
 	 tar cf - tex fonts | tar -C ${PREFIX}/share/texmf/ -xf -)
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 40df51b12b9a..8342648ba01c 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -91,7 +91,7 @@ do-build:
 		 -e 's,%%BASENAME%%,${BASENAME},g' \
 		 -e 's,%%CAT%%,${CAT},g' \
 		 -e 's,%%CP%%,${CP},g' \
-		 -e 's,%%ECHO%%,${ECHO},g' \
+		 -e 's,%%ECHO%%,${ECHO_CMD},g' \
 		 -e 's,%%GREP%%,${GREP},g' \
 		 -e 's,%%RM%%,${RM},g' \
 		 -e 's,%%SED%%,${SED},g' \
@@ -127,12 +127,12 @@ do-install:
 	${MKDIR} ${INFODIR}
 .if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule)
 	cd ${WRKSRC}; \
-	for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
+	for file in `${ECHO_CMD} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
 		${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}/$${file}.info; \
 	done
 .else
 	cd ${WRKSRC}; \
-	for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
+	for file in `${ECHO_CMD} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
 		${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}; \
 	done
 .endif