[jhbuild/wip/path-env: 13/20] config: handle UNMANGLED_ paths consistently

[Ryan Lortie <desrt src gnome org>]

commit 911b971eac17acafb15c9f742d23c6af0c4de702
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Mar 12 17:45:32 2014 -0400

    config: handle UNMANGLED_ paths consistently
    
    Move UNMANGLED_LD_LIBRARY_PATH to the same location as UNMANGLED_PATH.
    
    This prevents the variable from being set multiple times in the
    'extra_prefixes' case.

 jhbuild/config.py      |    1 +
 jhbuild/environment.py |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 0135a33..9c18b30 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -125,6 +125,7 @@ class Config:
 
         if not self._orig_environ:
             self.__dict__['_orig_environ'] = os.environ.copy()
+        os.environ['UNMANGLED_LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '')
         os.environ['UNMANGLED_PATH'] = os.environ.get('PATH', '')
 
         try:
diff --git a/jhbuild/environment.py b/jhbuild/environment.py
index d95bff4..ee64b22 100644
--- a/jhbuild/environment.py
+++ b/jhbuild/environment.py
@@ -111,8 +111,6 @@ def setup_env(prefix):
 
     os.environ['JHBUILD_PREFIX'] = prefix
 
-    os.environ['UNMANGLED_LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '')
-
     if not os.environ.get('DBUS_SYSTEM_BUS_ADDRESS'):
         # Use the distribution's D-Bus for the system bus. JHBuild's D-Bus
         # will # be used for the session bus