Fix header installs when using DESTDIR.

diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index d852525..03f40f5 100644 (file)
--- 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 39d2356..03956af 100644 (file)
--- 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 15fc7ce..e85e68b 100644 (file)
--- 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