Adapt numpy.numarray to new build dir convention.

immerrr · Jun 12, 2008 · fd5f2dc · fd5f2dc
1 parent be47c6f
commit fd5f2dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/numpy/numarray/SConscript b/numpy/numarray/SConscript
@@ -0,0 +1,9 @@
+# Last Change: Thu Jun 12 06:00 PM 2008 J
+# vim:syntax=python
+from numscons import GetNumpyEnvironment, scons_get_paths
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
+env.Append(CPPPATH = ['numpy'])
+
+_capi = env.DistutilsPythonExtension('_capi', source = ['_capi.c'])
diff --git a/numpy/numarray/SConstruct b/numpy/numarray/SConstruct
@@ -1,9 +1,2 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-env.Append(CPPPATH = env['src_dir'])
-
-_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c'])
+from numscons import GetInitEnvironment
+GetInitEnvironment(ARGUMENTS).DistutilsSConscript('SConscript')