diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-07-07 09:06:26 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-07-07 09:06:26 +0000 |
| commit | f67b0fbc9a65f344605b3aab8cc1d74bd920f8a3 (patch) | |
| tree | ae6e41e3d927c330abbfc9b481b128c5a66c0e4e /numpy/core/SConscript | |
| parent | 5e40a340552cd32705adf40f6bc5eb03a7d2b9ef (diff) | |
| download | numpy-f67b0fbc9a65f344605b3aab8cc1d74bd920f8a3.tar.gz | |
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.
Diffstat (limited to 'numpy/core/SConscript')
| -rw-r--r-- | numpy/core/SConscript | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 8474992ca..2a527ab8a 100644 --- a/numpy/core/SConscript +++ b/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')) |