diff -urN g-wrap-1.9.8.orig/libffi/configure.ac g-wrap-1.9.8/libffi/configure.ac
--- g-wrap-1.9.8.orig/libffi/configure.ac	2007-06-03 21:50:15.000000000 -0700
+++ g-wrap-1.9.8/libffi/configure.ac	2007-06-03 21:50:31.000000000 -0700
@@ -5,7 +5,7 @@
 AC_INIT([libffi], [2.1], [http://gcc.gnu.org/bugs.html])
 AC_CONFIG_HEADERS([fficonfig.h])
 
-AM_ENABLE_MULTILIB(, ..)
+#AM_ENABLE_MULTILIB(, ..)
 
 AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$host_alias}
diff -urN g-wrap-1.9.8.orig/libffi/include/Makefile.am g-wrap-1.9.8/libffi/include/Makefile.am
--- g-wrap-1.9.8.orig/libffi/include/Makefile.am	2007-06-03 21:50:15.000000000 -0700
+++ g-wrap-1.9.8/libffi/include/Makefile.am	2007-06-03 21:50:47.000000000 -0700
@@ -9,4 +9,4 @@
 gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
-toollibffi_HEADERS = ffi.h ffitarget.h
+include_HEADERS = ffi.h ffitarget.h