diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-04-21 04:33:10 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-04-21 04:33:10 +0000 |
| commit | a0109ed75443d8b475f04f1844c6dbcab84d6702 (patch) | |
| tree | 82c362476514b5bc2a0bc0723b4f1216ff69316a /Mk | |
| parent | d9db2548a52a00a1f296a1a3c33eb606b3fad68b (diff) | |
| download | ports-a0109ed75443d8b475f04f1844c6dbcab84d6702.tar.gz ports-a0109ed75443d8b475f04f1844c6dbcab84d6702.zip | |
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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/cabal.mk | 12 |
1 files 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 |