[pkgsrc/trunk]: pkgsrc/devel/pkgconfig Set the PKG_CONFIG environment variabl...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/396fb1193361
branches:  trunk
changeset: 468551:396fb1193361
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Feb 14 21:54:12 2004 +0000

description:
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:

 devel/pkgconfig/buildlink2.mk |  4 +++-
 devel/pkgconfig/buildlink3.mk |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 68fdee3cc052 -r 396fb1193361 devel/pkgconfig/buildlink2.mk
--- a/devel/pkgconfig/buildlink2.mk     Sat Feb 14 21:45:53 2004 +0000
+++ b/devel/pkgconfig/buildlink2.mk     Sat Feb 14 21:54:12 2004 +0000
@@ -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_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 -r 68fdee3cc052 -r 396fb1193361 devel/pkgconfig/buildlink3.mk
--- a/devel/pkgconfig/buildlink3.mk     Sat Feb 14 21:45:53 2004 +0000
+++ b/devel/pkgconfig/buildlink3.mk     Sat Feb 14 21:54:12 2004 +0000
@@ -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_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