Fix scons build w.r.t pkg-config and installed C lib location.

2 files changed, 4 insertions, 6 deletions

diff --git a/numpy/core/SConscript b/numpy/core/SConscript
index cab2486e7..f99b8e5d9 100644
--- a/numpy/core/SConscript
+++ b/numpy/core/SConscript
@@ -333,7 +333,7 @@ env.DistutilsInstalledStaticExtLibrary("npymath", npymath_src, install_dir='lib'
 env.Prepend(LIBS=["npymath"])
 env.Prepend(LIBPATH=["."])
 
-subst_dict = {'@prefix@': '$distutils_install_prefix/lib',
+subst_dict = {'@prefix@': '$distutils_install_prefix',
               '@sep@': os.path.sep}
 npymath_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'npymath.ini'),
     'npymath.ini.in', SUBST_DICT=subst_dict)
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."""