diff -r ef5e61ac27ad Makefile.pre.in --- a/Makefile.pre.in Wed Jan 23 09:30:34 2013 +0000 +++ b/Makefile.pre.in Fri Jan 25 12:58:36 2013 +0100 @@ -86,6 +86,9 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +# Multiarch directory (may be empty) +MULTIARCH= @MULTIARCH@ + # Install prefix for architecture-independent files prefix= @prefix@ @@ -980,6 +983,7 @@ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ export EXE; EXE="$(BUILDEXE)"; \ + if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen python-config: $(srcdir)/Misc/python-config.in diff -r ef5e61ac27ad Tools/scripts/h2py.py --- a/Tools/scripts/h2py.py Wed Jan 23 09:30:34 2013 +0000 +++ b/Tools/scripts/h2py.py Fri Jan 25 12:58:36 2013 +0100 @@ -58,6 +58,12 @@ raise KeyError except KeyError: searchdirs=['/usr/include'] + try: + searchdirs.insert(0, os.path.join('/usr/include', + os.environ['MULTIARCH'])) + except KeyError: + pass + def main(): global filedict diff -r ef5e61ac27ad configure.ac --- a/configure.ac Wed Jan 23 09:30:34 2013 +0000 +++ b/configure.ac Fri Jan 25 12:58:36 2013 +0100 @@ -603,6 +603,9 @@ ]) fi +MULTIARCH=$($CC --print-multiarch 2>/dev/null) +AC_SUBST(MULTIARCH) + # checks for UNIX variants that set C preprocessor variables AC_USE_SYSTEM_EXTENSIONS