diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-26 16:27:25 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-26 16:27:25 +0000 |
commit | ea0bbe8c3df1779150d21e5b46cfb88c524ecb35 (patch) | |
tree | 9bec10635207157bd89cee84debbc4d24900838d /mk | |
parent | bca90f60ad4f2f2578f22400d7320f4ef8deca52 (diff) | |
download | pkgsrc-ea0bbe8c3df1779150d21e5b46cfb88c524ecb35.tar.gz |
Fix bug in the sed expression used to filter out libtool archives. It was
mangling "lib/libaviplay.so.0.0" to "y.so.0.0". Thanks to Tomasz Luchowski
<zuntum@netbsd.org> for finding this.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.buildlink.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index 433bcdbc8ac..7234b089f7d 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.15 2001/06/26 16:00:13 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.16 2001/06/26 16:27:25 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -106,7 +106,8 @@ _BUILDLINK_USE: .USE ${ECHO_MSG} "Linking ${.TARGET:S/-buildlink//} files into ${BUILDLINK_DIR}."; \ ${MKDIR} ${BUILDLINK_DIR}; \ files="${BUILDLINK_FILES.${.TARGET:S/-buildlink//}:S/^/${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}\//g}"; \ - files="`${ECHO} $${files} | ${SED} -e 's|[^[:blank:]]*lib/[^[:blank:]]*.la||g'`"; \ + files="`${ECHO} $${files} | ${SED} -e 's|[^[:blank:]]*lib/[^[:blank:]]*.la$$||g' -e 's|[^[:blank:]]*lib/[^[:blank:]]*.la[[:blank:]]||g'`"; \ + echo "FILES: $${files}"; \ for file in $${files}; do \ rel_file=`${ECHO} $${file} | ${SED} -e "s|${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}/||"` ; \ if [ -z "${BUILDLINK_TRANSFORM.${.TARGET:S/-buildlink//}:Q}" ]; then \ |