Handle the share/pkgconfig directory where platform-independent packages

(e.g. gtk-doc 1.6) want to install .pc files.

14 files changed, 41 insertions, 15 deletions

diff --git a/mk/platform/AIX.pkg.dist b/mk/platform/AIX.pkg.dist
index f667434921b..0b3140dbe7a 100644
--- a/mk/platform/AIX.pkg.dist
+++ b/mk/platform/AIX.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: AIX.pkg.dist,v 1.19 2006/07/12 13:46:34 wiz Exp $
+#	$NetBSD: AIX.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -1215,6 +1215,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/BSDOS.pkg.dist b/mk/platform/BSDOS.pkg.dist
index 0ec33cb5214..bd3e3f2ef51 100644
--- a/mk/platform/BSDOS.pkg.dist
+++ b/mk/platform/BSDOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: BSDOS.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: BSDOS.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1215,6 +1215,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/Darwin.pkg.dist b/mk/platform/Darwin.pkg.dist
index 709fb994140..e4a8aff79fd 100644
--- a/mk/platform/Darwin.pkg.dist
+++ b/mk/platform/Darwin.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: Darwin.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: Darwin.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1265,6 +1265,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/DragonFly.pkg.dist b/mk/platform/DragonFly.pkg.dist
index 25b7b68d3a7..087b95d5e37 100644
--- a/mk/platform/DragonFly.pkg.dist
+++ b/mk/platform/DragonFly.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: DragonFly.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: DragonFly.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/FreeBSD.pkg.dist b/mk/platform/FreeBSD.pkg.dist
index 8f483090ea7..779fe8df7b8 100644
--- a/mk/platform/FreeBSD.pkg.dist
+++ b/mk/platform/FreeBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: FreeBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/IRIX.pkg.dist b/mk/platform/IRIX.pkg.dist
index 2a8cf0df376..96e722155ae 100644
--- a/mk/platform/IRIX.pkg.dist
+++ b/mk/platform/IRIX.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1264,6 +1264,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/Interix.pkg.dist b/mk/platform/Interix.pkg.dist
index 4fd1efd0241..826b321e715 100644
--- a/mk/platform/Interix.pkg.dist
+++ b/mk/platform/Interix.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: Interix.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: Interix.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uid=197108 gid=131616 mode=0775
@@ -1261,6 +1261,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/Linux.pkg.dist b/mk/platform/Linux.pkg.dist
index 0202452a0da..511b2020ebf 100644
--- a/mk/platform/Linux.pkg.dist
+++ b/mk/platform/Linux.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: Linux.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: Linux.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1265,6 +1265,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/NetBSD.pkg.dist b/mk/platform/NetBSD.pkg.dist
index 812d06cac1d..11e5b58ba56 100644
--- a/mk/platform/NetBSD.pkg.dist
+++ b/mk/platform/NetBSD.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: NetBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: NetBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1261,6 +1261,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/OSF1.pkg.dist b/mk/platform/OSF1.pkg.dist
index 7e0a404a1bf..2588406364a 100644
--- a/mk/platform/OSF1.pkg.dist
+++ b/mk/platform/OSF1.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+# $NetBSD: OSF1.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -1264,6 +1264,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/OpenBSD.pkg.dist b/mk/platform/OpenBSD.pkg.dist
index b148e18ddc3..02bad312822 100644
--- a/mk/platform/OpenBSD.pkg.dist
+++ b/mk/platform/OpenBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: OpenBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/SunOS.pkg.dist b/mk/platform/SunOS.pkg.dist
index 7ad0c56e5de..6a8ef337ceb 100644
--- a/mk/platform/SunOS.pkg.dist
+++ b/mk/platform/SunOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#	$NetBSD: SunOS.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: SunOS.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1269,6 +1269,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/platform/UnixWare.pkg.dist b/mk/platform/UnixWare.pkg.dist
index 2ac2c97187d..f314c4ec1a0 100644
--- a/mk/platform/UnixWare.pkg.dist
+++ b/mk/platform/UnixWare.pkg.dist
@@ -1,6 +1,6 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
 #	NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#	$NetBSD: UnixWare.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#	$NetBSD: UnixWare.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1270,6 +1270,8 @@
 	    uk_UA.KOI8-U
 	    ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk
index c06f65c38ee..41a1718082a 100644
--- a/mk/tools/pkg-config.mk
+++ b/mk/tools/pkg-config.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.5 2005/12/05 22:07:08 rillig Exp $
+# $NetBSD: pkg-config.mk,v 1.6 2006/08/06 09:35:39 jmmv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Override the location where pkg-config searches for *.pc files in the
 # pkg-config wrapper script.
 #
-_PKG_CONFIG_LIBDIR?=	${BUILDLINK_DIR}/lib/pkgconfig
+_PKG_CONFIG_LIBDIR?=	${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
 _PKG_CONFIG_LOG?=	${WRKDIR}/.pkg-config.log
 
 TOOLS_SCRIPT.pkg-config=	\