diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-22 20:20:33 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-22 20:20:33 +0000 |
| commit | afd2d15ee3267d63b689d92fab732a314d561e55 (patch) | |
| tree | cdfb159fe6822dfeb91e08c7a0b3e8ed8e75c6f1 /mk | |
| parent | 67a188989ed9d375e2aca74520f8b09475bc12b4 (diff) | |
| download | pkgsrc-afd2d15ee3267d63b689d92fab732a314d561e55.tar.gz | |
Use sed instead of a funky make RE variable to sanitize the PATH. It was
breaking when the directory names had RE characters like "+".
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 03c71bb5dcb..b06c1f932f5 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.2 2002/08/22 08:21:28 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.3 2002/08/22 20:20:33 jlam Exp $ # # An example package buildlink2.mk file: # @@ -383,8 +383,9 @@ BUILDLINK_SHELL?= ${SH} # directory from the PATH so that sub-invocations of compiler tools # will use the wrappees instead of the wrappers. # -_BLNK_WRAP_SANITIZE_PATH= \ - PATH="${PATH:C/:${BUILDLINK_DIR}[^:]*//:C/${BUILDLINK_DIR}[^:]*://}" +_BLNK_SANITIZED_PATH!= ${ECHO} ${PATH} | ${SED} \ + -e "s|:${BUILDLINK_DIR}[^:]*||" -e "s|${BUILDLINK_DIR}[^:]*:||" +_BLNK_WRAP_SANITIZE_PATH= PATH="${_BLNK_SANITIZED_PATH}" _BLNK_WRAP_PRE_CACHE= ${BUILDLINK_DIR}/bin/.pre-cache _BLNK_WRAP_POST_CACHE= ${BUILDLINK_DIR}/bin/.post-cache _BLNK_WRAP_CACHE= ${BUILDLINK_DIR}/bin/.cache |