2003-01-15 Havoc Pennington <hp@pobox.com>

Author: hp
Date: 2003-01-15 04:02:47 GMT
2003-01-15  Havoc Pennington  <hp@pobox.com>

	* pkg.c (package_init): honor a PKG_CONFIG_LIBDIR to move default
	search dir, useful in cross-compilation for example, bug
	#103545 fix from David Schleef

diff --git a/ChangeLog b/ChangeLog
index 54a79b7092db86d9c83a581ccfe5a22c6f013d93..a3b68bf0c0893e2e2008b21724bf592d963ccf5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-15  Havoc Pennington  <hp@pobox.com>
+
+       * pkg.c (package_init): honor a PKG_CONFIG_LIBDIR to move default 
+       search dir, useful in cross-compilation for example, bug 
+       #103545 fix from David Schleef
+       
 2003-01-01  Zack Rusin  <zack@kde.org>
 
        * main.c (main): added --libs-only-other and --cflags-only-other

diff --git a/pkg-config.1 b/pkg-config.1
index d460a64aa24548207071b311872942ba375ae8e6..6efca1071d1f24fc107e8d455df23a49cf70dd52 100644 (file)
--- a/pkg-config.1
+++ b/pkg-config.1
@@ -230,6 +230,10 @@ Don't strip -I/usr/include out of cflags.
 .I "PKG_CONFIG_ALLOW_SYSTEM_LIBS"
 Don't strip -L/usr/lib out of libs
 
+.TP
+.I "PKG_CONFIG_LIBDIR"
+Replaces the default \fIpkg-config\fP search directory.
+
 .SH WINDOWS SPECIALITIES
 If a .pc file is found in a directory that matches the usual
 conventions (i.e., ends with \\lib\\pkgconfig), the prefix for that

diff --git a/pkg.c b/pkg.c
index a8fd1cbdc761a29f2270afd34529bbab4cebba6b..300e9242c4707d8be4d0be923d6171fb589dcdf5 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -187,6 +187,11 @@ void
 package_init ()
 {
   static gboolean initted = FALSE;
+  const char *pkglibdir;
+
+  pkglibdir = g_getenv ("PKG_CONFIG_LIBDIR");
+  if (pkglibdir == NULL)
+    pkglibdir = PKGLIBDIR;
 
   if (!initted)
     {
@@ -197,7 +202,7 @@ package_init ()
       path_positions = g_hash_table_new (g_str_hash, g_str_equal);
       
       g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
-      scan_dir (PKGLIBDIR);
+      scan_dir (pkglibdir);
     }
 }