--- Python/Misc/python-config.in

+++ Python/Misc/python-config.in

@@ -36,14 +36,15 @@ elif opt == '--exec-prefix':

     print sysconfig.EXEC_PREFIX

 elif opt in ('--includes', '--cflags'):

-    flags = ['-I' + sysconfig.get_python_inc(),

-             '-I' + sysconfig.get_python_inc(plat_specific=True)]

-    if opt == '--cflags':

-        flags.extend(getvar('CFLAGS').split())

+    inc = sysconfig.get_python_inc()

+    inc_plat_specific = sysconfig.get_python_inc(plat_specific=True)

+    flags = ['-I' + inc]

+    if inc != inc_plat_specific:

+        flags.append('-I' + inc_plat_specific)

     print ' '.join(flags)

 elif opt in ('--libs', '--ldflags'):

-    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()

+    libs = []

     libs.append('-lpython'+pyver)

     # add the prefix/lib/pythonX.Y/config dir, but only if there is no

     # shared library in prefix/lib/.