diff options
| -rw-r--r-- | devel/pkgconfig/buildlink3.mk | 12 | ||||
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk index bca6210ab6b..f56a61281ee 100644 --- a/devel/pkgconfig/buildlink3.mk +++ b/devel/pkgconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/02/14 21:54:12 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 21:01:17 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+ @@ -13,11 +13,11 @@ BUILDLINK_DEPENDS.pkgconfig+= pkgconfig>=0.15.0 BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig BUILDLINK_DEPMETHOD.pkgconfig?= build -PKG_CONFIG_PATH?= ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig -CONFIGURE_ENV+= PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config" -CONFIGURE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" -MAKE_ENV+= PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config" -MAKE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" +PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig +CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} +MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config +MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} .endif # PKGCONFIG_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 9419da62bc8..a79a0f2ca34 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.86 2004/02/16 03:08:52 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.87 2004/02/16 21:01:17 jlam Exp $ # # An example package buildlink3.mk file: # @@ -484,7 +484,7 @@ BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \ ${GREP} 'lib.*/lib[^/]*\.la$$' . else BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \ - ${EGREP} '(include.*/|\.h$$|lib.*/lib[^/]*$$)' + ${EGREP} '(include.*/|\.h$$|\.pc$$|lib.*/lib[^/]*$$)' . endif BUILDLINK_FILES_CMD.${_pkg_}?= \ ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} | \ |