Add /usr/local/scons* to sys.path.

2 files changed, 20 insertions, 2 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f24435b..52671cb 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,15 @@
 
 
 
+RELEASE 0.03 - 
+
+  From Steven Knight:
+
+  - Search both /usr/lib and /usr/local/lib for scons directories by
+    adding them both to sys.path, with whichever is in sys.prefix first.
+
+
+
 RELEASE 0.02 - Sun, 23 Dec 2001 19:05:09 -0600
 
   From Charles Crain:
diff --git a/src/script/scons.py b/src/script/scons.py
index 9929c8f..e1a6c08 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -46,8 +46,17 @@ if sys.platform == 'win32':
     libs.extend([ os.path.join(sys.prefix, 'SCons-__VERSION__'),
                   os.path.join(sys.prefix, 'SCons') ])
 else:
-    libs.extend([ os.path.join(sys.prefix, 'lib', 'scons-__VERSION__'),
-                  os.path.join(sys.prefix, 'lib', 'scons') ])
+    _usr = os.path.join('', 'usr')
+    _usr_local = os.path.join('', 'usr', 'local')
+    if sys.prefix[-len(_usr):] == _usr:
+        prefs = [sys.prefix, os.path.join(sys.prefix, "local")]
+    elif sys.prefix[-len(_usr_local)] == _usr_local:
+        _local = os.path.join('', 'local')
+        prefs = [sys.prefix[:-len(_local)], sys.prefix]
+    else:
+        prefs = [sys.prefix]
+    libs.extend(map(lambda x: os.path.join(x, 'lib', 'scons-__VERSION__'), prefs))
+    libs.extend(map(lambda x: os.path.join(x, 'lib', 'scons'), prefs))
 
 sys.path = libs + sys.path[1:]