From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 16 Aug 2006 17:57:14 +0000 (+0200)
Subject: 2006-08-16  Tollef Fog Heen  <tfheen@err.no>
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69f5752d7dd43c3f0c5fb04a472bd95acd0a79d5;p=pkg-config

2006-08-16  Tollef Fog Heen  <tfheen@err.no>

	* main.c (main): Always add the elements from PKG_CONFIG_PATH.
	Freedesktop #4795.
---

diff --git a/ChangeLog b/ChangeLog
index 1e7c77c..92fee0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-16  Tollef Fog Heen  <tfheen@err.no>
 
+	* main.c (main): Always add the elements from PKG_CONFIG_PATH.
+	Freedesktop #4795.
+
 	* pkg-config.1: Apply patch from Ed Catmur to document
 	PKG_PROG_PKG_CONFIG and that it should be used if the first call
 	to PKG_CHECK_MODULES might not happen.
diff --git a/main.c b/main.c
index d0df377..68c3d42 100644
--- a/main.c
+++ b/main.c
@@ -281,18 +281,17 @@ main (int argc, char **argv)
       debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n");
     }
 
+  search_path = getenv ("PKG_CONFIG_PATH");
+  if (search_path) 
+    {
+      add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
+    }
   if (getenv("PKG_CONFIG_LIBDIR") != NULL) 
     {
       add_search_dirs(getenv("PKG_CONFIG_LIBDIR"), G_SEARCHPATH_SEPARATOR_S);
     }
   else
     {
-      search_path = getenv ("PKG_CONFIG_PATH");
-      if (search_path) 
-	{
-	  add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
-	}
-      
       add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
     }