[cig-commits] commit: Once again, handling relative paths correctly.

[Mercurial]

changeset:   68:ea1cb41992f9
user:        LukeHodkinson
date:        Mon Apr 07 01:21:15 2008 +0000
files:       config/SConfig/Package.py
description:
Once again, handling relative paths correctly.


diff -r 1dd41beb7461 -r ea1cb41992f9 config/SConfig/Package.py
--- a/config/SConfig/Package.py	Mon Apr 07 00:58:09 2008 +0000
+++ b/config/SConfig/Package.py	Mon Apr 07 01:21:15 2008 +0000
@@ -440,9 +440,11 @@ int main(int argc, char* argv[]) {
             for d in self.lib_dirs:
                 abs_dir = self.join_sub_dir(self.base_dir, d)
                 if abs_dir in self.system_library_dirs:
+                    if not os.path.isabs(abs_dir): abs_dir = '#' + abs_dir
                     scons_env.AppendUnique(LIBPATH=[abs_dir])
                     scons_env.AppendUnique(RPATH=[os.path.abspath(abs_dir)])
                 else:
+                    if not os.path.isabs(abs_dir): abs_dir = '#' + abs_dir
                     scons_env.PrependUnique(LIBPATH=[abs_dir])
                     scons_env.PrependUnique(RPATH=[os.path.abspath(abs_dir)])