[cig-commits] r9254 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2008-02-06 11:38:15 -0800 (Wed, 06 Feb 2008)
New Revision: 9254

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/configure_vars.in
Log:
 r2010 at earth:  boo | 2008-02-05 23:36:38 -0800
 Make configuration a little more robust



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1998
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2010

Modified: long/3D/Gale/trunk/configure_vars.in
===================================================================
--- long/3D/Gale/trunk/configure_vars.in	2008-02-06 16:48:25 UTC (rev 9253)
+++ long/3D/Gale/trunk/configure_vars.in	2008-02-06 19:38:15 UTC (rev 9254)
@@ -63,7 +63,10 @@
         env.Append(CPPPATH=['#/'+path])
 env.Append(LIBS=Split('@LIBXML2_LIBS@'))
 for path in Split('@LIBXML2_LIBPATH@'):
-    env.Append(LIBPATH=['#/'+path])
+    if(path[0]=='/'):
+        env.Append(LIBPATH=[path])
+    else:
+        env.Append(LIBPATH=['#/'+path])
 env.Append(RPATH=Split('@LIBXML2_LIBPATH@'))
 
 # Add in the petsc paths
@@ -74,7 +77,10 @@
         env.Append(CPPPATH=['#/'+path])
 env.Append(LIBS=Split('@PETSC_LIBS@'))
 for path in Split('@PETSC_LIBPATH@'):
-    env.Append(LIBPATH=['#/'+path])
+    if(path[0]=='/'):
+        env.Append(LIBPATH=[path])
+    else:
+        env.Append(LIBPATH=['#/'+path])
 env.Append(RPATH=Split('@PETSC_LIBPATH@'))
 env.ParseConfig('echo "@PETSC_DEPS@"')