[jhbuild] Fix value of ACLOCAL_PATH to include the system directory



commit 8fbe583a00c785b1572bacba92a500b7e877d628
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Sun Jun 29 21:11:16 2014 +0200

    Fix value of ACLOCAL_PATH to include the system directory
    
    If ACLOCAL_PATH is set, the system aclocal directory is ignored,
    so we need to add it explicitly to the search path.

 jhbuild/environment.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/jhbuild/environment.py b/jhbuild/environment.py
index 92588de..d098047 100644
--- a/jhbuild/environment.py
+++ b/jhbuild/environment.py
@@ -98,6 +98,10 @@ def setup_env_defaults(system_libdirs):
     if not 'XDG_CONFIG_DIRS' in os.environ:
         XDG_CONFIG_DIRS='/etc/xdg'
 
+    # ACLOCAL_PATH
+    if not 'ACLOCAL_PATH' in os.environ:
+        ACLOCAL_PATH='/usr/share/aclocal'
+
     # get rid of gdkxft from the env -- it will cause problems.
     if os.environ.has_key('LD_PRELOAD'):
         valarr = os.environ['LD_PRELOAD'].split(' ')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]