[Scipy-svn] r4572 - in trunk/scipy: . sparse/linalg/eigen/arpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-07-29 00:37:59 -0500 (Tue, 29 Jul 2008)
New Revision: 4572

Modified:
   trunk/scipy/setupscons.py
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
Log:
Fix F77PATH in scipy.sparse, which was not updated during the new build_dir migration for numscons.

Modified: trunk/scipy/setupscons.py
===================================================================
--- trunk/scipy/setupscons.py	2008-07-29 05:16:38 UTC (rev 4571)
+++ trunk/scipy/setupscons.py	2008-07-29 05:37:59 UTC (rev 4572)
@@ -19,7 +19,7 @@
     config.add_subpackage('sparse')
     config.add_subpackage('special')
     config.add_subpackage('stats')
-    config.add_subpackage('ndimage')
+    #config.add_subpackage('ndimage')
     config.add_subpackage('stsci')
     config.add_subpackage('weave')
     config.make_svn_version_py()  # installs __svn_version__.py

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-29 05:16:38 UTC (rev 4571)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-29 05:37:59 UTC (rev 4572)
@@ -24,6 +24,7 @@
 config.Finish()
 write_info(env)
 
+print env.Dump()
 # Build arpack
 arpack_src = [pjoin("ARPACK", "SRC", s) for s in [ "cgetv0.f", "cnaitr.f",
 "cnapps.f", "cnaup2.f", "cnaupd.f", "cneigh.f", "cneupd.f", "cngets.f",
@@ -48,7 +49,7 @@
 src = [str(s) for s in arpack_src]
 
 env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))
-env.AppendUnique(F77PATH = pjoin(env['src_dir'], 'ARPACK', 'SRC'))
+env.AppendUnique(F77PATH = pjoin('ARPACK', 'SRC'))
 env.AppendUnique(LIBPATH = '.')
 arpack_lib = env.DistutilsStaticExtLibrary('arpack', source = src)