Merged revisions 1675-1736 via svnmerge from

[scons.git] / src / script / sconsign.py

diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 6f19d568b8900e1fd42ddcfd42282772ec20a0b9..66f8887d42c20dff3d8d48bb4814c14574179567 100644 (file)
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -70,7 +70,7 @@ if os.environ.has_key("SCONS_LIB_DIR"):
 local = 'scons-local-' + __version__
 if script_dir:
     local = os.path.join(script_dir, local)
-libs.append(local)
+libs.append(os.path.abspath(local))
 
 scons_version = 'scons-%s' % __version__
 
@@ -166,6 +166,8 @@ import whichdb
 import SCons.SConsign
 
 def my_whichdb(filename):
+    if filename[-7:] == ".dblite":
+        return "SCons.dblite"
     try:
         f = open(filename + ".dblite", "rb")
         f.close()