From 69f5752d7dd43c3f0c5fb04a472bd95acd0a79d5 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Wed, 16 Aug 2006 19:57:14 +0200 Subject: [PATCH] 2006-08-16 Tollef Fog Heen * main.c (main): Always add the elements from PKG_CONFIG_PATH. Freedesktop #4795. --- ChangeLog | 3 +++ main.c | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e7c77c..92fee0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-16 Tollef Fog Heen + * 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); } -- 2.39.5