3K: ENH: move numarray includes under numarray/include so that the 'numpy' directory does not confuse 2to3's relative import conversion

9 files changed, 3 insertions, 3 deletions

diff --git a/numpy/numarray/numpy/arraybase.h b/numpy/numarray/include/numpy/arraybase.h
index a964979ce..a964979ce 100644
--- a/numpy/numarray/numpy/arraybase.h
+++ b/numpy/numarray/include/numpy/arraybase.h
diff --git a/numpy/numarray/numpy/cfunc.h b/numpy/numarray/include/numpy/cfunc.h
index b581be08f..b581be08f 100644
--- a/numpy/numarray/numpy/cfunc.h
+++ b/numpy/numarray/include/numpy/cfunc.h
diff --git a/numpy/numarray/numpy/ieeespecial.h b/numpy/numarray/include/numpy/ieeespecial.h
index 0f3fff2a9..0f3fff2a9 100644
--- a/numpy/numarray/numpy/ieeespecial.h
+++ b/numpy/numarray/include/numpy/ieeespecial.h
diff --git a/numpy/numarray/numpy/libnumarray.h b/numpy/numarray/include/numpy/libnumarray.h
index f23a07d7a..f23a07d7a 100644
--- a/numpy/numarray/numpy/libnumarray.h
+++ b/numpy/numarray/include/numpy/libnumarray.h
diff --git a/numpy/numarray/numpy/numcomplex.h b/numpy/numarray/include/numpy/numcomplex.h
index 9ed4198c7..9ed4198c7 100644
--- a/numpy/numarray/numpy/numcomplex.h
+++ b/numpy/numarray/include/numpy/numcomplex.h
diff --git a/numpy/numarray/numpy/nummacro.h b/numpy/numarray/include/numpy/nummacro.h
index e9acd6e31..e9acd6e31 100644
--- a/numpy/numarray/numpy/nummacro.h
+++ b/numpy/numarray/include/numpy/nummacro.h
diff --git a/numpy/numarray/setup.py b/numpy/numarray/setup.py
index 8231aea13..641990217 100644
--- a/numpy/numarray/setup.py
+++ b/numpy/numarray/setup.py
@@ -4,7 +4,7 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('numarray',parent_package,top_path)
 
-    config.add_data_files('numpy/*')
+    config.add_data_files('include/numpy/*')
 
     config.add_extension('_capi',
                          sources=['_capi.c'],
diff --git a/numpy/numarray/setupscons.py b/numpy/numarray/setupscons.py
index 37d53a8ef..173612ae8 100644
--- a/numpy/numarray/setupscons.py
+++ b/numpy/numarray/setupscons.py
@@ -4,7 +4,7 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('numarray',parent_package,top_path)
 
-    config.add_data_files('numpy/')
+    config.add_data_files('include/numpy/')
     config.add_sconscript('SConstruct', source_files = ['_capi.c'])
 
     return config
diff --git a/numpy/numarray/util.py b/numpy/numarray/util.py
index 3f0fc20d0..64a3f1711 100644
--- a/numpy/numarray/util.py
+++ b/numpy/numarray/util.py
@@ -35,5 +35,5 @@ def handleError(errorStatus, sourcemsg):
 
 def get_numarray_include_dirs():
     base = os.path.dirname(numpy.__file__)
-    newdirs = [os.path.join(base, 'numarray')]
+    newdirs = [os.path.join(base, 'numarray', 'include')]
     return newdirs