git: f500b9d07c81 - main - Uses/cabal.mk: Replace all occurencies of '-' instead of only one.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Jun 2022 19:13:28 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f500b9d07c812cef4a2e84a9f3ee9ed26806bfe8
commit f500b9d07c812cef4a2e84a9f3ee9ed26806bfe8
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-06-30 15:50:45 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-06-30 19:13:20 +0000
Uses/cabal.mk: Replace all occurencies of '-' instead of only one.
Executables named "foo-bar-baz" are now correctly handled.
---
Mk/Uses/cabal.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 6c6872eb0024..b01e53d309ef 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -246,9 +246,9 @@ do-install:
${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/${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}
+ ${ECHO_CMD} 'export ${exe:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
. for dep in ${${exe}_DATADIR_VARS}
- ${ECHO_CMD} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+ ${ECHO_CMD} 'export ${dep:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
. endfor
${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
${ECHO_CMD} 'exec ${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}