[cig-commits] commit: Still trying.

[Mercurial]

changeset:   69:d99cc254bf6b
user:        LukeHodkinson
date:        Mon Apr 07 01:27:51 2008 +0000
files:       config/SConfig/Package.py
description:
Still trying.


diff -r ea1cb41992f9 -r d99cc254bf6b config/SConfig/Package.py
--- a/config/SConfig/Package.py	Mon Apr 07 01:21:15 2008 +0000
+++ b/config/SConfig/Package.py	Mon Apr 07 01:27:51 2008 +0000
@@ -418,13 +418,13 @@ int main(int argc, char* argv[]) {
         if self.hdr_dirs:
             self.backup_variable(scons_env, 'CPPPATH', old_state)
             for d in self.hdr_dirs:
-                abs_dir = self.join_sub_dir(self.base_dir, d)
-                if abs_dir in self.system_header_dirs:
-                    if not os.path.isabs(abs_dir): abs_dir = '#' + abs_dir
-                    scons_env.AppendUnique(CPPPATH=[abs_dir])
+                full_dir = self.join_sub_dir(self.base_dir, d)
+                if full_dir in self.system_header_dirs:
+                    if not os.path.isabs(full_dir): full_dir = '#' + full_dir
+                    scons_env.AppendUnique(CPPPATH=[full_dir])
                 else:
-                    if not os.path.isabs(abs_dir): abs_dir = '#' + abs_dir
-                    scons_env.PrependUnique(CPPPATH=[abs_dir])
+                    if not os.path.isabs(full_dir): full_dir = '#' + full_dir
+                    scons_env.PrependUnique(CPPPATH=[full_dir])
 
         if self.fworks:
             self.backup_variable(scons_env, 'FRAMEWORKS', old_state)
@@ -438,15 +438,16 @@ int main(int argc, char* argv[]) {
             self.backup_variable(scons_env, 'LIBPATH', old_state)
             self.backup_variable(scons_env, 'RPATH', old_state)
             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)])
+                full_dir = self.join_sub_dir(self.base_dir, d)
+                if full_dir in self.system_library_dirs:
+                    abs_dir = os.path.abspath(full_dir)
+                    if not os.path.isabs(full_dir): full_dir = '#' + full_dir
+                    scons_env.AppendUnique(LIBPATH=[full_dir])
+                    scons_env.AppendUnique(RPATH=[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)])
+                    if not os.path.isabs(full_dir): full_dir = '#' + full_dir
+                    scons_env.PrependUnique(LIBPATH=[full_dir])
+                    scons_env.PrependUnique(RPATH=[abs_dir])
 
         if self.libs:
             self.backup_variable(scons_env, 'LIBS', old_state)