diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-03-19 10:25:18 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-03-19 10:25:18 +0000 |
| commit | fa9fac0efd2094a02a6c7cb01ea586a13c47937e (patch) | |
| tree | 5c2ffc368a74152becc36c86cd88564e80adde84 | |
| parent | f2014dc397c2f285566b439a8a6148a14b6a3ef9 (diff) | |
GNU's pkg-config added PREFIX/share/pkgconfig/ as a search path 4 years
ago. It is mostly used to store arch-independant dot.pc files (although
not always); so add this directory to our search path as well (will ease
porters' work).
While here, also add X11BASE/share/pkgconfig since X.org seems to do the
same (req. by matthieu@)
ok dcoppa@ fgsch@ phessler@
| -rw-r--r-- | usr.bin/pkg-config/pkg-config | 8 | ||||
| -rw-r--r-- | usr.bin/pkg-config/pkg-config.1 | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index 21802a8da88..158a42f9382 100644 --- a/usr.bin/pkg-config/pkg-config +++ b/usr.bin/pkg-config/pkg-config @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: pkg-config,v 1.70 2011/11/17 11:37:16 jasper Exp $ +# $OpenBSD: pkg-config,v 1.71 2012/03/19 10:25:17 ajacoutot Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> @@ -25,7 +25,11 @@ use File::Basename; use File::stat; use OpenBSD::PkgConfig; -my @PKGPATH = qw(/usr/lib/pkgconfig /usr/local/lib/pkgconfig /usr/X11R6/lib/pkgconfig); +my @PKGPATH = qw(/usr/lib/pkgconfig + /usr/local/lib/pkgconfig + /usr/local/share/pkgconfig + /usr/X11R6/lib/pkgconfig + /usr/X11R6/share/pkgconfig); if (defined($ENV{PKG_CONFIG_LIBDIR}) && $ENV{PKG_CONFIG_LIBDIR}) { @PKGPATH = split(/:/, $ENV{PKG_CONFIG_LIBDIR}); diff --git a/usr.bin/pkg-config/pkg-config.1 b/usr.bin/pkg-config/pkg-config.1 index fcf84eea25c..ab4fac611de 100644 --- a/usr.bin/pkg-config/pkg-config.1 +++ b/usr.bin/pkg-config/pkg-config.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg-config.1,v 1.25 2011/09/25 17:53:40 jmc Exp $ +.\" $OpenBSD: pkg-config.1,v 1.26 2012/03/19 10:25:17 ajacoutot Exp $ .\" .\" Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: September 25 2011 $ +.Dd $Mdocdate: March 19 2012 $ .Dt PKG-CONFIG 1 .Os .Sh NAME @@ -43,9 +43,13 @@ Libraries from base install their metadata in packages controlled by the .Xr ports 7 system store their metadata, if provided, in -.Pa ${LOCALBASE}/lib/pkgconfig ; +.Pa ${LOCALBASE}/lib/pkgconfig +and +.Pa ${LOCALBASE}/share/pkgconfig ; the X Window System stores its metadata in -.Pa ${X11BASE}/lib/pkgconfig . +.Pa ${X11BASE}/lib/pkgconfig +and +.Pa ${X11BASE}/share/pkgconfig . The .Nm utility will search these locations by default. |