traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #1523356: fix determining include dirs in python-config. 

Also don't install "python-config" when doing altinstall, but
always install "python-config2.x" and make a link to it like
with the main executable.
This commit is contained in:
Georg Brandl 2006-07-24 13:28:57 +00:00
parent 982e9fea0a
commit ced52a97b6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.pre.in
View File

@ -649,6 +649,7 @@ bininstall: altbininstall
else true; \ else true; \
fi fi
(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
(cd $(DESTDIR)$(BINDIR); $(LN) -sf python-config$(VERSION)$(EXE) python-config$(EXE))
# Install the interpreter with $(VERSION) affixed # Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
@ -849,8 +850,8 @@ libainstall: all
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
# Substitution happens here, as the completely-expanded BINDIR # Substitution happens here, as the completely-expanded BINDIR
# is not available in configure # is not available in configure
sed -e "s,@BINDIR@,$(BINDIR)," < $(srcdir)/Misc/python-config.in >python-config sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python-config $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python-config$(VERSION)$(EXE)
rm python-config rm python-config
@if [ -s Modules/python.exp -a \ @if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \

7
Misc/python-config.in
View File

@ -1,4 +1,4 @@
#!@BINDIR@/python #!@EXENAME@
import sys import sys
import os import os
@ -36,13 +36,14 @@ elif opt == '--exec-prefix':
print sysconfig.EXEC_PREFIX print sysconfig.EXEC_PREFIX
elif opt in ('--includes', '--cflags'): elif opt in ('--includes', '--cflags'):
flags = ['-I'+dir for dir in getvar('INCLDIRSTOMAKE').split()] flags = ['-I' + sysconfig.get_python_inc(),
'-I' + sysconfig.get_python_inc(plat_specific=True)]
if opt == '--cflags': if opt == '--cflags':
flags.extend(getvar('CFLAGS').split()) flags.extend(getvar('CFLAGS').split())
print ' '.join(flags) print ' '.join(flags)
elif opt in ('--libs', '--ldflags'): elif opt in ('--libs', '--ldflags'):
libs = sysconfig.get_config_var('LIBS').split() libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
libs.append('-lpython'+pyver) libs.append('-lpython'+pyver)
if opt == '--ldflags': if opt == '--ldflags':
libs.insert(0, '-L' + getvar('LIBPL')) libs.insert(0, '-L' + getvar('LIBPL'))