[cig-commits] commit: Wasn't handling relative paths correctly.

Mercurial hg at geodynamics.org
Mon Nov 24 11:23:00 PST 2008


changeset:   67:1dd41beb7461
user:        LukeHodkinson
date:        Mon Apr 07 00:58:09 2008 +0000
files:       config/SConfig/Package.py
description:
Wasn't handling relative paths correctly.


diff -r 460b079bd3bf -r 1dd41beb7461 config/SConfig/Package.py
--- a/config/SConfig/Package.py	Mon Apr 07 00:41:49 2008 +0000
+++ b/config/SConfig/Package.py	Mon Apr 07 00:58:09 2008 +0000
@@ -420,8 +420,10 @@ int main(int argc, char* argv[]) {
             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])
                 else:
+                    if not os.path.isabs(abs_dir): abs_dir = '#' + abs_dir
                     scons_env.PrependUnique(CPPPATH=[abs_dir])
 
         if self.fworks:



More information about the CIG-COMMITS mailing list