Skip to content
Browse files

Fix installed location of generated headers.

Headers and .c files generated for the C API for multiarray and  ufunc
are now put in build_dir/numpy/core/include/numpy instead of
build_dir/numpy/core.
  • Loading branch information...
1 parent 5e40a34 commit f67b0fbc9a65f344605b3aab8cc1d74bd920f8a3 @cournape cournape committed Jul 7, 2009
Showing with 8 additions and 3 deletions.
  1. +8 −3 numpy/core/SConscript
View
11 numpy/core/SConscript
@@ -307,13 +307,18 @@ scalarmathmodule_src = env.GenerateFromTemplate(
umath = env.GenerateUmath('__umath_generated',
pjoin('code_generators', 'generate_umath.py'))
-multiarray_api = env.GenerateMultiarrayApi('multiarray_api',
+multiarray_api = env.GenerateMultiarrayApi('include/numpy/multiarray_api',
[ pjoin('code_generators', 'numpy_api_order.txt')])
+generated_headers.append(multiarray_api[0])
-ufunc_api = env.GenerateUfuncApi('ufunc_api',
+ufunc_api = env.GenerateUfuncApi('include/numpy/ufunc_api',
pjoin('code_generators', 'ufunc_api_order.txt'))
+generated_headers.append(ufunc_api[0])
-env.Prepend(CPPPATH = ['include', '.'])
+# include/numpy is added for compatibility reasons with distutils: this is
+# needed for __multiarray_api.c and __ufunc_api.c included from multiarray and
+# ufunc.
+env.Prepend(CPPPATH = ['include', '.', 'include/numpy'])
# npymath core lib
npymath_src = env.GenerateFromTemplate(pjoin('src', 'npymath', 'npy_math.c.src'))

0 comments on commit f67b0fb

Please sign in to comment.
Something went wrong with that request. Please try again.