diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2004-08-13 00:48:05 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2004-08-13 00:48:05 +0000 |
| commit | d7098ab8a254004d760f21caa492a67831410fd4 (patch) | |
| tree | 0858f72977f0f32bf96122431a74f6c6479ffc0d | |
| parent | e18fbbdd4fa8e414dd0a7480b18642b43c1b13c0 (diff) | |
| download | pkgsrc-d7098ab8a254004d760f21caa492a67831410fd4.tar.gz | |
add some quoting to deal with the case where a file in a package
has a space in the filename. Without the quoting the buildlink
stage fails completely with errors. ok'ed by Johnny Lam.
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 0a77965d2a2..a2d0d559494 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.147 2004/08/10 15:16:29 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.148 2004/08/13 00:48:05 dmcmahill Exp $ # # An example package buildlink3.mk file: # @@ -614,7 +614,7 @@ ${_BLNK_COOKIE.${_pkg_}}: ${_BLNK_FILES_CMD.${_pkg_}} | \ while read file; do \ src="${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \ - if [ ! -f $$src ]; then \ + if [ ! -f "$$src" ]; then \ msg="$$src: not found"; \ else \ if [ -z "${BUILDLINK_TRANSFORM.${_pkg_}:Q}" ]; then \ @@ -625,20 +625,20 @@ ${_BLNK_COOKIE.${_pkg_}}: dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_TRANSFORM.${_pkg_}}`; \ msg="$$src -> $$dest"; \ fi; \ - dir=`${DIRNAME} $$dest`; \ - if [ ! -d $$dir ]; then \ - ${MKDIR} $$dir; \ + dir=`${DIRNAME} "$$dest"`; \ + if [ ! -d "$$dir" ]; then \ + ${MKDIR} "$$dir"; \ fi; \ - ${RM} -f $$dest; \ - case $$src in \ + ${RM} -f "$$dest"; \ + case "$$src" in \ *.la) \ - ${CAT} $$src | \ + ${CAT} "$$src" | \ ${_BLNK_LT_ARCHIVE_FILTER.${_pkg_}} \ - > $$dest; \ + > "$$dest"; \ msg="$$msg (created)"; \ ;; \ *) \ - ${LN} -sf $$src $$dest; \ + ${LN} -sf "$$src" "$$dest"; \ ;; \ esac; \ fi; \ |