Mk/Uses/cabal.mk: use ECHO_CMD not ECHO (D29852)

ECHO is set to true on make -s in /usr/share/mk/sys.mk and shouldn't be used for things like this. Approved by: arrowd
freebsd · Apr 21, 2021 · a0109ed · a0109ed
1 parent d9db254
commit a0109ed
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
@@ -189,14 +189,14 @@ do-install:
 	${INSTALL_PROGRAM} \
 		$$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \
 		${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/${exe}
-	${ECHO} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe}
-	${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
-	${ECHO} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 .         for dep in ${${exe}_DATADIR_VARS}
-	${ECHO} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 .         endfor
-	${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
-	${ECHO} '${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+	${ECHO_CMD} '${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${exe}
 .      endfor
 .    endif