mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 03:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Reverted changes which were inadvertently committed.

Browse source
This commit is contained in:
Vinay Sajip 2010-09-20 10:29:54 +00:00
parent 61c3f0dae7
commit ae7d7fa0fe
2 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/distutils/sysconfig.py
View file

@ -56,18 +56,6 @@ def get_python_version():
""" """
return sys.version[:3] return sys.version[:3]
def _get_build_dir(name, plat_specific):
# Assume the executable is in the build directory. The
# pyconfig.h file should be in the same directory. Since
# the build directory may not be the source directory, we
# must use "srcdir" from the makefile to find the "Include"
# directory.
base = os.path.dirname(os.path.abspath(sys.executable))
if plat_specific:
return base
else:
thedir = os.path.join(get_config_var('srcdir'), name)
return os.path.normpath(thedir)
def get_python_inc(plat_specific=0, prefix=None): def get_python_inc(plat_specific=0, prefix=None):
"""Return the directory containing installed Python header files. """Return the directory containing installed Python header files.
@ -84,7 +72,17 @@ def get_python_inc(plat_specific=0, prefix=None):
prefix = plat_specific and EXEC_PREFIX or PREFIX prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix": if os.name == "posix":
if python_build: if python_build:
return _get_build_dir('Include', plat_specific) # Assume the executable is in the build directory. The
# pyconfig.h file should be in the same directory. Since
# the build directory may not be the source directory, we
# must use "srcdir" from the makefile to find the "Include"
# directory.
base = os.path.dirname(os.path.abspath(sys.executable))
if plat_specific:
return base
else:
incdir = os.path.join(get_config_var('srcdir'), 'Include')
return os.path.normpath(incdir)
return os.path.join(prefix, "include", "python" + get_python_version()) return os.path.join(prefix, "include", "python" + get_python_version())
elif os.name == "nt": elif os.name == "nt":
return os.path.join(prefix, "include") return os.path.join(prefix, "include")
@ -119,8 +117,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
prefix = plat_specific and EXEC_PREFIX or PREFIX prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix": if os.name == "posix":
if python_build:
return _get_build_dir('Lib', plat_specific)
libpython = os.path.join(prefix, libpython = os.path.join(prefix,
"lib", "python" + get_python_version()) "lib", "python" + get_python_version())
if standard_lib: if standard_lib:

3
Lib/sysconfig.py
View file

@ -123,9 +123,8 @@ _PYTHON_BUILD = is_python_build()
if _PYTHON_BUILD: if _PYTHON_BUILD:
for scheme in ('posix_prefix', 'posix_home'): for scheme in ('posix_prefix', 'posix_home'):
_INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include' _INSTALL_SCHEMES[scheme]['include'] = '{srcdir}/Include'
_INSTALL_SCHEMES[scheme]['platinclude'] = '{projectbase}/.' _INSTALL_SCHEMES[scheme]['platinclude'] = '{projectbase}/.'
_INSTALL_SCHEMES[scheme]['stdlib'] = '{projectbase}/Lib'
def _subst_vars(s, local_vars): def _subst_vars(s, local_vars):
try: try: