Fix the scons.bat file for the new library packaging.

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

diff --git a/src/script/scons.bat b/src/script/scons.bat
index 3955f281735b68c7cb3e0ff7b651845e3a41c3bb..d2770c6758adb127aa3eeaab5412a252a529aec6 100644 (file)
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
 @echo off
 if "%OS%" == "Windows_NT" goto WinNT
 REM for 9x/Me you better not have more than 9 args
-python -c "import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
 REM no way to set exit status of this script for 9x/Me
 goto endscons
 :WinNT
-python -c "import SCons.Script; SCons.Script.main()" %*
+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
 if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endscons
 if errorlevel 9009 echo you do not have python in your PATH
 REM color 00 causes this script to exit with non-zero exit status