Date: Wed, 21 Apr 2021 04:57:39 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a0109ed75443 - main - Mk/Uses/cabal.mk: use ECHO_CMD not ECHO (D29852) Message-ID: <202104210457.13L4vdAb077970@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0109ed75443d8b475f04f1844c6dbcab84d6702 commit a0109ed75443d8b475f04f1844c6dbcab84d6702 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-04-21 04:33:10 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-04-21 04:33:10 +0000 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 --- Mk/Uses/cabal.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index b4551058c061..78a8acb271cb 100644 --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104210457.13L4vdAb077970>