[Numpy-svn] r5375 - in branches/1.1.x/numpy: core f2py

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-07-09 05:25:26 -0500 (Wed, 09 Jul 2008)
New Revision: 5375

Modified:
   branches/1.1.x/numpy/core/SConscript
   branches/1.1.x/numpy/f2py/setupscons.py
Log:
More backport from 1.2 for numscons build.

Modified: branches/1.1.x/numpy/core/SConscript
===================================================================
--- branches/1.1.x/numpy/core/SConscript	2008-07-09 10:23:50 UTC (rev 5374)
+++ branches/1.1.x/numpy/core/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
@@ -1,4 +1,4 @@
-# Last Change: Thu Jun 12 04:00 PM 2008 J
+# Last Change: Sun Jul 06 01:00 PM 2008 J
 # vim:syntax=python
 import os
 import sys
@@ -234,7 +234,7 @@
 ufunc_api = env.GenerateUfuncApi('ufunc_api',
                     pjoin('code_generators', 'ufunc_api_order.txt'))
 
-env.Append(CPPPATH = ['include', '.'])
+env.Prepend(CPPPATH = ['include', '.'])
 
 #-----------------
 # Build multiarray

Modified: branches/1.1.x/numpy/f2py/setupscons.py
===================================================================
--- branches/1.1.x/numpy/f2py/setupscons.py	2008-07-09 10:23:50 UTC (rev 5374)
+++ branches/1.1.x/numpy/f2py/setupscons.py	2008-07-09 10:25:26 UTC (rev 5375)
@@ -30,8 +30,6 @@
 def configuration(parent_package='',top_path=None):
     config = Configuration('f2py', parent_package, top_path)
 
-    config.add_subpackage('lib')
-
     config.add_data_dir('docs')
 
     config.add_data_files('src/fortranobject.c',