diff options
author | David Cournapeau <cournape@gmail.com> | 2009-07-26 11:18:10 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2009-07-26 11:18:10 +0000 |
commit | 50d010c72dc3649cecf247cc637458ba98a15f2a (patch) | |
tree | c0991c46eafd239279cd62550be685f47f900587 /numpy/distutils/command/scons.py | |
parent | ae9596c78bc85a6d52c467aec499016c335ef602 (diff) | |
download | numpy-50d010c72dc3649cecf247cc637458ba98a15f2a.tar.gz |
Fix scons build w.r.t pkg-config and installed C lib location.
Diffstat (limited to 'numpy/distutils/command/scons.py')
-rw-r--r-- | numpy/distutils/command/scons.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/numpy/distutils/command/scons.py b/numpy/distutils/command/scons.py index 374c1c533..a7d5ac9c7 100644 --- a/numpy/distutils/command/scons.py +++ b/numpy/distutils/command/scons.py @@ -68,13 +68,11 @@ def get_distutils_clibdir(cmd, pkg): def get_distutils_install_prefix(pkg, inplace): """Returns the installation path for the current package.""" from numscons.core.utils import pkg_to_path - install_cmd = get_cmd('install') - if hasattr(install_cmd, 'install_libbase'): - return pjoin(install_cmd.install_libbase, pkg_to_path(pkg)) - elif inplace == 1: + if inplace == 1: return pkg_to_path(pkg) else: - return '' + install_cmd = get_cmd('install').get_finalized_command('install') + return pjoin(install_cmd.install_libbase, pkg_to_path(pkg)) def get_python_exec_invoc(): """This returns the python executable from which this file is invocated.""" |