diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-12-12 09:15:51 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-12-12 09:15:51 +0000 |
| commit | bfdb22a137e7ed2a8061b38f7da734f8e60101b0 (patch) | |
| tree | 3a3a417847768cd77a1e702c81ea777cd2dac08a /numpy | |
| parent | 9a32a8d6821bec385cb572fec8f71beab136d3d5 (diff) | |
| download | numpy-bfdb22a137e7ed2a8061b38f7da734f8e60101b0.tar.gz | |
BUG: fix #1273: npy-pkg-info files did not work for eggs.
We use the pkgdir variable which is automatically translate at runtime.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/npymath.ini.in | 3 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/npymath.ini.in b/numpy/core/npymath.ini.in index 73379e47c..a233b8f3b 100644 --- a/numpy/core/npymath.ini.in +++ b/numpy/core/npymath.ini.in @@ -4,7 +4,8 @@ Description=Portable, core math library implementing C99 standard Version=0.1 [variables] -prefix=@prefix@ +pkgname=@pkgname@ +prefix=${pkgdir} libdir=${prefix}@sep@lib includedir=${prefix}@sep@include diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 4981702de..66b6bffef 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -655,7 +655,7 @@ def configuration(parent_package='',top_path=None): # explicitly add an extension which has generate_config_h and # generate_numpyconfig_h as sources *before* adding npymath. - subst_dict = dict([("sep", os.path.sep)]) + subst_dict = dict([("sep", os.path.sep), ("pkgname", "numpy.core")]) def get_mathlib_info(*args): # Another ugly hack: the mathlib info is known once build_src is run, # but we cannot use add_installed_pkg_config here either, so we only |