diff options
| author | William Deegan <bill@baddogconsulting.com> | 2014-03-09 12:46:50 -0700 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2014-03-09 12:46:50 -0700 |
| commit | 651a7a796ca2bdd2eeb423f577cbe6f5cf39c516 (patch) | |
| tree | 82e6daf6f9615d0e71e380c0fa3b340f7ebd15e2 | |
| parent | 397e2660b3a2acad0b7db6afba19fe2dfb63f88c (diff) | |
| parent | 6d3b1d815e7cd8a2b6b706fb57db3954ba3bbc5e (diff) | |
| download | scons-651a7a796ca2bdd2eeb423f577cbe6f5cf39c516.tar.gz | |
merged default head
| -rw-r--r-- | src/script/scons.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/script/scons.py b/src/script/scons.py index 8dcc371d..3638fa75 100644 --- a/src/script/scons.py +++ b/src/script/scons.py @@ -38,6 +38,7 @@ __developer__ = "__DEVELOPER__" import os import sys + ############################################################################## # BEGIN STANDARD SCons SCRIPT HEADER # @@ -72,6 +73,11 @@ libs = [] if "SCONS_LIB_DIR" in os.environ: libs.append(os.environ["SCONS_LIB_DIR"]) +# - running from source takes priority (since 2.3.2), excluding SCONS_LIB_DIR settings +script_path = os.path.abspath(os.path.dirname(__file__)) +source_path = os.path.join(script_path, '..', 'engine') +libs.append(source_path) + local_version = 'scons-local-' + __version__ local = 'scons-local' if script_dir: @@ -85,9 +91,6 @@ scons_version = 'scons-%s' % __version__ # preferred order of scons lookup paths prefs = [] -# - running from source takes priority (since 2.3.2) -script_path = os.path.abspath(os.path.dirname(__file__)) -source_path = os.path.join(script_path, '..', 'engine') # - running from egg check try: @@ -176,7 +179,7 @@ else: libs.extend([os.path.join(x, scons_version) for x in prefs]) libs.extend([os.path.join(x, 'scons') for x in prefs]) -sys.path = [source_path] + libs + sys.path +sys.path = libs + sys.path ############################################################################## # END STANDARD SCons SCRIPT HEADER |