[Scipy-svn] r6218 - trunk/scipy/special

scipy-svn@scip... scipy-svn@scip...
Mon Feb 8 03:46:08 CST 2010


Author: stefan
Date: 2010-02-08 03:46:08 -0600 (Mon, 08 Feb 2010)
New Revision: 6218

Modified:
   trunk/scipy/special/SConscript
Log:
bug: Avoid accidentally using other numpy installations by prepending include path.

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2010-02-08 09:19:40 UTC (rev 6217)
+++ trunk/scipy/special/SConscript	2010-02-08 09:46:08 UTC (rev 6218)
@@ -22,8 +22,7 @@
 config.CheckF77Mangling()
 config.Finish()
 
-env.AppendUnique(CPPPATH = env["PYEXTCPPPATH"]) 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.PrependUnique(CPPPATH=[get_numpy_include_dirs(), env["PYEXTCPPPATH"]])
 def build_lib(name, ext, libname = None):
     """ext should be .f or .c"""
     if not libname:
@@ -47,7 +46,7 @@
 math_info = get_pkg_info("npymath")
 env.MergeFlags(math_info.cflags())
 env.MergeFlags(math_info.libs())
-env.AppendUnique(LIBPATH = ['.'])
+env.PrependUnique(LIBPATH = ['.'])
 
 # orthogonal_eval extension
 env.NumpyPythonExtension('orthogonal_eval', source = 'orthogonal_eval.c')



More information about the Scipy-svn mailing list