mirror of https://github.com/python/cpython
Jonathan Giddy:
The first one only shows up if $prefix != $exec_prefix, and the problem is caused by the recent change in location for config.h.
This commit is contained in:
parent
69256612d7
commit
590fc2c4fa
|
@ -175,6 +175,7 @@ def main():
|
||||||
print "(Using Python source directory)"
|
print "(Using Python source directory)"
|
||||||
binlib = exec_prefix
|
binlib = exec_prefix
|
||||||
incldir = os.path.join(prefix, 'Include')
|
incldir = os.path.join(prefix, 'Include')
|
||||||
|
config_h_dir = exec_prefix
|
||||||
config_c_in = os.path.join(prefix, 'Modules', 'config.c.in')
|
config_c_in = os.path.join(prefix, 'Modules', 'config.c.in')
|
||||||
frozenmain_c = os.path.join(prefix, 'Python', 'frozenmain.c')
|
frozenmain_c = os.path.join(prefix, 'Python', 'frozenmain.c')
|
||||||
makefile_in = os.path.join(exec_prefix, 'Modules', 'Makefile')
|
makefile_in = os.path.join(exec_prefix, 'Modules', 'Makefile')
|
||||||
|
@ -184,12 +185,14 @@ def main():
|
||||||
binlib = os.path.join(exec_prefix,
|
binlib = os.path.join(exec_prefix,
|
||||||
'lib', 'python%s' % version, 'config')
|
'lib', 'python%s' % version, 'config')
|
||||||
incldir = os.path.join(prefix, 'include', 'python%s' % version)
|
incldir = os.path.join(prefix, 'include', 'python%s' % version)
|
||||||
|
config_h_dir = os.path.join(exec_prefix, 'include',
|
||||||
|
'python%s' % version)
|
||||||
config_c_in = os.path.join(binlib, 'config.c.in')
|
config_c_in = os.path.join(binlib, 'config.c.in')
|
||||||
frozenmain_c = os.path.join(binlib, 'frozenmain.c')
|
frozenmain_c = os.path.join(binlib, 'frozenmain.c')
|
||||||
makefile_in = os.path.join(binlib, 'Makefile')
|
makefile_in = os.path.join(binlib, 'Makefile')
|
||||||
supp_sources = []
|
supp_sources = []
|
||||||
defines = []
|
defines = []
|
||||||
includes = ['-I' + incldir, '-I' + binlib]
|
includes = ['-I' + incldir, '-I' + config_h_dir]
|
||||||
|
|
||||||
# sanity check of directories and files
|
# sanity check of directories and files
|
||||||
for dir in [prefix, exec_prefix, binlib, incldir] + extensions:
|
for dir in [prefix, exec_prefix, binlib, incldir] + extensions:
|
||||||
|
|
Loading…
Reference in New Issue