summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2008-06-12 09:55:30 +0000
committerDavid Cournapeau <cournape@gmail.com>2008-06-12 09:55:30 +0000
commitfd5f2dc162067d7dc8e66d7cafc8be151fb9a0c7 (patch)
tree17089fab399769d11a1ac847fba3ab2ba3e680a5
parentbe47c6fe315821136d4953de01bacb67a07c5f0a (diff)
downloadnumpy-fd5f2dc162067d7dc8e66d7cafc8be151fb9a0c7.tar.gz
Adapt numpy.numarray to new build dir convention.
-rw-r--r--numpy/numarray/SConscript9
-rw-r--r--numpy/numarray/SConstruct11
2 files changed, 11 insertions, 9 deletions
diff --git a/numpy/numarray/SConscript b/numpy/numarray/SConscript
new file mode 100644
index 000000000..766e8e9df
--- /dev/null
+++ 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
index e07b45ae7..a377d8391 100644
--- 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')