diff options
| author | Georg Brandl <georg@python.org> | 2006-07-24 13:28:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-07-24 13:28:57 (GMT) |
| commit | ced52a97b66b564a69cb35edea1502d84d8d9d19 (patch) | |
| tree | 3c74ca834e6af5d3c70ee4c46f2a56760a4a4a75 | |
| parent | 982e9fea0a9c6026b4d176ce136676ab1893e4b2 (diff) | |
| download | cpython-ced52a97b66b564a69cb35edea1502d84d8d9d19.zip cpython-ced52a97b66b564a69cb35edea1502d84d8d9d19.tar.gz cpython-ced52a97b66b564a69cb35edea1502d84d8d9d19.tar.bz2 | |
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.
| -rw-r--r-- | Makefile.pre.in | 5 | ||||
| -rw-r--r-- | Misc/python-config.in | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index ff6dc25..8f05d0d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -649,6 +649,7 @@ bininstall: altbininstall else true; \ fi (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 # This goes into $(exec_prefix) @@ -849,8 +850,8 @@ libainstall: all $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh # Substitution happens here, as the completely-expanded BINDIR # is not available in configure - sed -e "s,@BINDIR@,$(BINDIR)," < $(srcdir)/Misc/python-config.in >python-config - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/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$(VERSION)$(EXE) rm python-config @if [ -s Modules/python.exp -a \ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ diff --git a/Misc/python-config.in b/Misc/python-config.in index 24e699e..e0215a2 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -1,4 +1,4 @@ -#!@BINDIR@/python +#!@EXENAME@ import sys import os @@ -36,13 +36,14 @@ elif opt == '--exec-prefix': print sysconfig.EXEC_PREFIX 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': flags.extend(getvar('CFLAGS').split()) print ' '.join(flags) elif opt in ('--libs', '--ldflags'): - libs = sysconfig.get_config_var('LIBS').split() + libs = getvar('LIBS').split() + getvar('SYSLIBS').split() libs.append('-lpython'+pyver) if opt == '--ldflags': libs.insert(0, '-L' + getvar('LIBPL')) |