[jhbuild/wip/path-env: 3/20] setup_env(): remove partial_build conditions

[Ryan Lortie <desrt src gnome org>]

commit 07e4ff134b4d87ef67542c534575127fac8322d3
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Mar 10 00:20:51 2014 -0400

    setup_env(): remove partial_build conditions
    
    Don't consult the partial_build variable when deciding if or if not to
    include the default paths (/usr/local, /usr) in the aclocal and
    pkg-config paths.
    
    This is a leftover from the days that it was actually reasonably
    possible to bootstrap yourself into a complete jhbuild world without
    depending on anything on the system at all.

 jhbuild/config.py |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 6d45c70..47a5d90 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -469,7 +469,7 @@ class Config:
         addpath('INFOPATH', infopathdir)
 
         # PKG_CONFIG_PATH
-        if os.environ.get('PKG_CONFIG_PATH') is None and self.partial_build:
+        if os.environ.get('PKG_CONFIG_PATH') is None:
             for dirname in ('share', 'lib', 'lib64'):
                 full_name = '/usr/%s/pkgconfig' % dirname
                 if os.path.exists(full_name):
@@ -535,11 +535,10 @@ class Config:
                 os.makedirs(aclocaldir)
             except:
                 raise FatalError(_("Can't create %s directory") % aclocaldir)
-        if self.partial_build:
-            if os.path.exists('/usr/share/aclocal'):
-                addpath('ACLOCAL_FLAGS', '/usr/share/aclocal')
-                if os.path.exists('/usr/local/share/aclocal'):
-                    addpath('ACLOCAL_FLAGS', '/usr/local/share/aclocal')
+        if os.path.exists('/usr/share/aclocal'):
+            addpath('ACLOCAL_FLAGS', '/usr/share/aclocal')
+            if os.path.exists('/usr/local/share/aclocal'):
+                addpath('ACLOCAL_FLAGS', '/usr/local/share/aclocal')
         addpath('ACLOCAL_FLAGS', aclocaldir)
 
         # PERL5LIB