diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-02-14 21:54:12 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-02-14 21:54:12 +0000 |
| commit | c14ae04206ebf01be32695e4f52e1e78a42e38ae (patch) | |
| tree | 6aa1cdf13f9d8654614b368042ee5bfd77e5f2d5 /devel | |
| parent | 51306be9c1a72ac7bd6163ddb1047a55c7ae199a (diff) | |
| download | pkgsrc-c14ae04206ebf01be32695e4f52e1e78a42e38ae.tar.gz | |
Set the PKG_CONFIG environment variable to point to pkg-config's binary so
that configure does not need to look for it and it can be used in Makefiles.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pkgconfig/buildlink2.mk | 4 | ||||
| -rw-r--r-- | devel/pkgconfig/buildlink3.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/devel/pkgconfig/buildlink2.mk b/devel/pkgconfig/buildlink2.mk index 8eb53189878..fe1dd6c3677 100644 --- a/devel/pkgconfig/buildlink2.mk +++ b/devel/pkgconfig/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/02/14 21:14:38 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2004/02/14 21:54:12 jmmv Exp $ .if !defined(PKGCONFIG_BUILDLINK2_MK) PKGCONFIG_BUILDLINK2_MK= # defined @@ -9,7 +9,9 @@ BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig BUILDLINK_DEPMETHOD.pkgconfig?= build PKG_CONFIG_PATH?= ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig +CONFIGURE_ENV+= PKG_CONFIG="${BUILDLINK_DEPENDS.pkgconfig}/bin/pkg-config" CONFIGURE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" +MAKE_ENV+= PKG_CONFIG="${BUILDLINK_DEPENDS.pkgconfig}/bin/pkg-config" MAKE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" .endif # PKGCONFIG_BUILDLINK2_MK diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk index 7cacbe29aa5..bca6210ab6b 100644 --- a/devel/pkgconfig/buildlink3.mk +++ b/devel/pkgconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/14 21:54:12 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+ @@ -14,7 +14,9 @@ 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}" .endif # PKGCONFIG_BUILDLINK3_MK |