jhbuild r2555 - in trunk: . jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sun Nov 30 20:58:22 2008
New Revision: 2555
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2555&view=rev

Log:
* jhbuild/config.py: updated PKG_CONFIG_PATH configuration logic to
only add existing directories, including /usr/lib64/pkgconfig/.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/config.py

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Nov 30 20:58:22 2008
@@ -203,8 +203,10 @@
             # realm; this also helps when building a single module with
             # jhbuild.  It is possible to avoid this by setting PKG_CONFIG_PATH
             # to the empty string.
-            addpath('PKG_CONFIG_PATH', '/usr/share/pkgconfig')
-            addpath('PKG_CONFIG_PATH', '/usr/lib/pkgconfig')
+            for dirname in ('share', 'lib', 'lib64'):
+                full_name = '/usr/%s/pkgconfig' % dirname
+                if os.path.exists(full_name):
+                    addpath('PKG_CONFIG_PATH', full_name)
         pkgconfigdatadir = os.path.join(self.prefix, 'share', 'pkgconfig')
         pkgconfigdir = os.path.join(libdir, 'pkgconfig')
         addpath('PKG_CONFIG_PATH', pkgconfigdatadir)