[Scipy-svn] r4439 - in trunk/scipy: optimize sparse/linalg/dsolve

[scipy-svn@scip...]

Author: cdavid
Date: 2008-06-12 06:23:17 -0500 (Thu, 12 Jun 2008)
New Revision: 4439

Modified:
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/dsolve/SConscript
Log:
Fix some include paths related to scons build_dir arch changes.

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-06-12 10:59:41 UTC (rev 4438)
+++ trunk/scipy/optimize/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
@@ -14,7 +14,7 @@
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 env.Append(CPPPATH = get_numpy_include_dirs())
-env.Append(CPPPATH = env['F2PYINCLUDEDIR'])
+env.Append(CPPPATH = [env['F2PYINCLUDEDIR'], 'Zeros'])
 #if os.name == 'nt':
 #    # NT needs the pythonlib to run any code importing Python.h, including
 #    # simple code using only typedef and so on, so we need it for configuration

Modified: trunk/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 10:59:41 UTC (rev 4438)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
@@ -37,7 +37,7 @@
 
 # Build python extensions
 pyenv = env.Clone()
-pyenv.Append(CPPPATH = [get_numpy_include_dirs(), env['src_dir']])
+pyenv.Append(CPPPATH = [get_numpy_include_dirs(), pjoin('SuperLU', 'SRC')])
 pyenv.Prepend(LIBS = superlu)
 common_src = ['_superlu_utils.c', '_superluobject.c']