summaryrefslogtreecommitdiff
path: root/numpy/distutils/misc_util.py
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2007-04-01 20:32:07 +0000
committercookedm <cookedm@localhost>2007-04-01 20:32:07 +0000
commitfc796af91ae586ab446ac94bb3070f5034eb8032 (patch)
tree7638ba819cb5c03831a1dea3ada8d0aa743f8177 /numpy/distutils/misc_util.py
parent2d1cb578494e28ae9e3ac3143a14d778194ed5d8 (diff)
downloadnumpy-fc796af91ae586ab446ac94bb3070f5034eb8032.tar.gz
Make numpy.get_include() and numpy.get_numarray_include() not pull in numpy.distutils.
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r--numpy/distutils/misc_util.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 456363ecb..fad34e712 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1372,14 +1372,7 @@ def get_numpy_include_dirs():
include_dirs = Configuration.numpy_include_dirs[:]
if not include_dirs:
import numpy
- if numpy.show_config is None:
- # running from numpy_core source directory
- include_dirs.append(njoin(os.path.dirname(numpy.__file__),
- 'core', 'include'))
- else:
- # using installed numpy core headers
- import numpy.core as core
- include_dirs.append(njoin(os.path.dirname(core.__file__), 'include'))
+ include_dirs = [ numpy.get_include() ]
# else running numpy/core/setup.py
return include_dirs