diff options
| author | jlam <jlam> | 2002-09-03 21:43:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-03 21:43:40 +0000 |
| commit | 51d2889a9d92e2b2ea8e45f6075b0481f757dca5 (patch) | |
| tree | f69ed630c578e9fd16b71c6af053f6fd2fa942f8 | |
| parent | 22d6b566550c8f72bb9ef82ce66753ffd21ec5bc (diff) | |
| download | pkgsrc-51d2889a9d92e2b2ea8e45f6075b0481f757dca5.tar.gz | |
Fix botch in previous commit which caused the sanitized PATH to not be
inserted into the wrapper scripts.
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index adfc556d2ad..e3e66061fca 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.10 2002/09/03 03:14:10 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.11 2002/09/03 21:43:40 jlam Exp $ # # An example package buildlink2.mk file: # @@ -476,7 +476,7 @@ MAKE_ENV+= ${_BLNK_WRAP_ENV.${_wrappee_}} BUILDLINK_${_wrappee_}= \ ${BUILDLINK_DIR}/bin/${${_wrappee_}:T:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} -_BLNK_WRAPPER_TRANSFORM_SED= \ +_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}= \ -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \ -e "s|@BUILDLINK_SHELL@|${BUILDLINK_SHELL}|g" \ -e "s|@CAT@|${CAT:Q}|g" \ @@ -527,7 +527,7 @@ ${BUILDLINK_${_wrappee_}}: \ esac; \ ${MKDIR} ${.TARGET:H}; \ ${CAT} ${_BLNK_WRAPPER_SH.${_wrappee_}} | \ - ${SED} ${_BLNK_WRAPPER_TRANSFORM_SED} \ + ${SED} ${_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}} \ -e "s|@WRAPPEE@|$${absdir}${${_wrappee_}:Q}|g" \ > ${.TARGET}; \ ${CHMOD} +x ${.TARGET} @@ -561,7 +561,7 @@ buildlink-${_BLNK_OPSYS}-wrappers: buildlink-wrappers "Creating ${_BLNK_OPSYS} wrapper: $${wrapper}"; \ ${RM} -f $${wrapper}; \ ${CAT} ${_BLNK_WRAPPER_SH.${_wrappee_}} | \ - ${SED} ${_BLNK_WRAPPER_TRANSFORM_SED} \ + ${SED} ${_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}} \ -e "s|@WRAPPEE@|${${_wrappee_}.${_BLNK_OPSYS}}|g" \ > $${wrapper}; \ ${CHMOD} +x $${wrapper}; \ |