diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-19 20:27:44 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-19 20:27:44 +0000 |
| commit | 725855d0956b36934400a69593a6a9c4e388b7bc (patch) | |
| tree | 1d8f3ac21d3003ed5398298c29ceddab9bb1b919 /mk | |
| parent | b146e338471ab66b5d2713e1c370fe937474b82a (diff) | |
| download | pkgsrc-725855d0956b36934400a69593a6a9c4e388b7bc.tar.gz | |
Don't match "bin/libtool" and symlink into the buildlink directory if
libtool/buildlink3.mk is included by a package Makefile, as that symlink
overwrites the libtool wrapper script. This fixes pkg/24851.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 7b710584a39..3c9453053ef 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.125 2004/03/18 09:22:34 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.126 2004/03/19 20:27:44 jlam Exp $ # # An example package buildlink3.mk file: # @@ -590,7 +590,7 @@ BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \ ${GREP} 'lib.*/lib[^/]*\.la$$' . else BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \ - ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' + ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*\.[^/]*$$)' . endif BUILDLINK_FILES_CMD.${_pkg_}?= \ ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} | \ |