From 27e52f33baa069012a5adb2a3807f9ca1f2165ab Mon Sep 17 00:00:00 2001
From: green <green>
Date: Sun, 3 Feb 2008 13:59:48 +0000
Subject: [PATCH] Fix header installs when using DESTDIR.

---
 libffi/ChangeLog.libffi    | 6 ++++++
 libffi/include/Makefile.am | 2 +-
 libffi/include/Makefile.in | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index d8525254..03f40f51 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,3 +1,9 @@
+2008-02-03  Anthony Green  <green@redhat.com>
+
+	* include/Makefile.am (includesdir): Fix header install with
+	DESTDIR.
+	* include/Makefile.in: Rebuilt.
+
 2008-02-03  Timothy Wall  <twall@users.sf.net>
 
 	* src/x86/ffi.c (FFI_INIT_TRAMPOLINE_STDCALL): Calculate jump return
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am
index 39d23562..03956afa 100644
--- a/libffi/include/Makefile.am
+++ b/libffi/include/Makefile.am
@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
 DISTCLEANFILES=ffitarget.h
 EXTRA_DIST=ffi.h.in ffi_common.h
 
-includesdir = $(DESTDIR)$(includedir)
+includesdir = $(includedir)
 includes_HEADERS = ffi.h ffitarget.h
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 15fc7ce7..e85e68b1 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -182,7 +182,7 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = ffitarget.h
 EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(DESTDIR)$(includedir)
+includesdir = $(includedir)
 includes_HEADERS = ffi.h ffitarget.h
 all: all-am