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.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index ff6dc25efa67fdeb89615ff0b22be734ff2cd0b3..8f05d0de499b552141fbdfe34963d36ebcc59e30 100644 (file)
--- 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 24e699efb2664741e5e28e745fd76af1d5857694..e0215a2695874e4a2f45a709f2937533102adc84 100644 (file)
--- 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'))