mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Comment fix.

Browse source 
Always use normalized (with os.path.normpath()) versions of prefix and
  exec_prefix.
This commit is contained in:
Greg Ward 2000-02-02 00:05:14 +00:00
parent 3c8baedaf8
commit a0ca3f24f9
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/distutils/sysconfig.py
View file

@ -13,15 +13,20 @@ import re
import string import string
import sys import sys
prefix = os.path.normpath (sys.prefix)
exec_prefix = os.path.normpath (sys.exec_prefix)
def get_config_h_filename(): def get_config_h_filename():
"""Return full pathname of installed config.h file.""" """Return full pathname of installed config.h file."""
return os.path.join(sys.exec_prefix, "include", "python" + sys.version[:3], return os.path.join(exec_prefix,
"include", "python" + sys.version[:3],
"config.h") "config.h")
def get_makefile_filename(): def get_makefile_filename():
"""Return full pathname of installed Makefile from the Python build.""" """Return full pathname of installed Makefile from the Python build."""
return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3], return os.path.join(exec_prefix,
"lib", "python" + sys.version[:3],
"config", "Makefile") "config", "Makefile")
def parse_config_h(fp, g=None): def parse_config_h(fp, g=None):
@ -125,7 +130,7 @@ def _init_posix():
g = globals() g = globals()
# load the installed config.h: # load the installed config.h:
parse_config_h(open(get_config_h_filename()), g) parse_config_h(open(get_config_h_filename()), g)
# load the installed Makefile.pre.in: # load the installed Makefile:
parse_makefile(open(get_makefile_filename()), g) parse_makefile(open(get_makefile_filename()), g)
@ -134,16 +139,16 @@ def _init_nt():
g=globals() g=globals()
# load config.h, though I don't know how useful this is # load config.h, though I don't know how useful this is
parse_config_h(open( parse_config_h(open(
os.path.join(sys.exec_prefix, "include", "config.h")), g) os.path.join(exec_prefix, "include", "config.h")), g)
# set basic install directories # set basic install directories
g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib") g['LIBDEST']=os.path.join(exec_prefix, "Lib")
g['BINLIBDEST']= os.path.join(sys.exec_prefix, "Lib") g['BINLIBDEST']= os.path.join(exec_prefix, "Lib")
# XXX hmmm.. a normal install puts include files here # XXX hmmm.. a normal install puts include files here
g['INCLUDEPY'] = os.path.join (sys.prefix, 'include' ) g['INCLUDEPY'] = os.path.join (prefix, 'include' )
g['SO'] = '.dll' g['SO'] = '.dll'
g['exec_prefix'] = sys.exec_prefix g['exec_prefix'] = exec_prefix
try: try:
exec "_init_" + os.name exec "_init_" + os.name