Move /opt/bin to between /usr/local/bin and /bin on the default POSIX path.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1365 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 902b915940c86c6f9b5446b325c7a1ab8dc8902b..383be62731a674a056c7d9465baa2b75140b0d51 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -517,7 +517,8 @@ RELEASE 0.97 - XXX
 
   From Asfand Yar Qazi:
 
-  - Add /opt/bin to the default execution PATH on all POSIX platforms.
+  - Add /opt/bin to the default execution PATH on all POSIX platforms
+    (between /usr/local/bin and /bin).
 
   From Kevin Quick:
 

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 7e61b616d3606a988131978694bffc4340f74b2c..776f16bdf92832572e2e0a30c5754c4245a60c39 100644 (file)
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -157,6 +157,20 @@ RELEASE 0.97 - XXX
 
             env = Environment(tools = ['default', 'f77'])
 
+    --  /opt/bin AND /sw/bin ADDED TO DEFAULT EXECUTION PATH VARIABLES
+
+        On all POSIX systems, the default execution PATH variable has had
+        the /opt/bin directory added after the /usr/local/bin directory
+        and before /bin and /usr/bin directories.  This may cause SCons
+        to find and/or different compilers, linkers, etc. if you have
+        any same-named utilities installed in /opt/bin that it previously
+        found in /bin or /usr/bin.
+
+        On Mac OS X (Darwin) systems, the /sw/bin directory has been added
+        to the end of the default execution PATH.  This may cause SCons
+        to find compilers, linkers and other utilities it previously did
+        not, although it should not otherwise change existing behavior.
+
     --  SOLARIS DEFAULT SHARED OBJECT PREFIXES AND SUFFIXES HAVE CHANGED
 
         On Solaris, SCons now builds shared objects from C and C++ source

diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index 4822c35ffba87dbc8c3953cfc1d71bfc5bf2dbbe..675167e4f730daf6130beb24f57c110c0eb5378d 100644 (file)
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -224,7 +224,7 @@ def generate(env):
 
     if not env.has_key('ENV'):
         env['ENV']        = {}
-    env['ENV']['PATH']    = '/usr/local/bin:/bin:/usr/bin:/opt/bin'
+    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
     env['OBJPREFIX']      = ''
     env['OBJSUFFIX']      = '.o'
     env['SHOBJPREFIX']    = '$OBJPREFIX'