Index: configure
--- configure.orig	2014-11-12 12:59:57.000000000 +0100
+++ configure	2014-12-08 18:30:02.214464765 +0100
@@ -18716,7 +18716,7 @@
 
 # These variables are only ever used when we cross-build to X86_WIN32.
 # And we only support this with GCC, so...
-if test "x$GCC" = "xyes"; then
+if false; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
     toolexecdir="${exec_prefix}"/'$(target_alias)'
Index: include/Makefile.in
--- include/Makefile.in.orig	2014-11-12 12:59:58.000000000 +0100
+++ include/Makefile.in	2014-12-08 18:22:54.474380019 +0100
@@ -314,7 +314,7 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = ffitarget.h
 EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
 nodist_includes_HEADERS = ffi.h ffitarget.h
 all: all-am
 
Index: libffi.pc.in
--- libffi.pc.in.orig	2014-11-08 13:47:24.000000000 +0100
+++ libffi.pc.in	2014-12-08 18:22:54.474380019 +0100
@@ -2,7 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
 
 Name: @PACKAGE_NAME@
 Description: Library supporting Foreign Function Interfaces