From 50d010c72dc3649cecf247cc637458ba98a15f2a Mon Sep 17 00:00:00 2001 From: David Cournapeau Date: Sun, 26 Jul 2009 11:18:10 +0000 Subject: Fix scons build w.r.t pkg-config and installed C lib location. --- numpy/distutils/command/scons.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'numpy/distutils/command/scons.py') 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.""" -- cgit v1.2.1