1ad9005e98
My last commit c1137b6db7 "libffi: fix
libffi.pc file" broke the host build as that still placed the header
files to /usr/lib/libffi-3.0.13/include/ and the libffi.pc file pointed
to /usr/include/ . With this patch I took the patch from Debian and
also made the install process to put the header files to /usr/include
in all situations.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
36 lines
1 KiB
Diff
36 lines
1 KiB
Diff
--- a/libffi.pc.in
|
|
+++ b/libffi.pc.in
|
|
@@ -1,10 +1,10 @@
|
|
prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
|
|
+includedir=@includedir@
|
|
|
|
Name: @PACKAGE_NAME@
|
|
Description: Library supporting Foreign Function Interfaces
|
|
Version: @PACKAGE_VERSION@
|
|
-Libs: -L${libdir} -lffi
|
|
-Cflags: -I${includedir}
|
|
+Libs: -lffi
|
|
+Cflags:
|
|
--- a/include/Makefile.am
|
|
+++ b/include/Makefile.am
|
|
@@ -5,5 +5,5 @@ 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
|
|
--- a/include/Makefile.in
|
|
+++ b/include/Makefile.in
|
|
@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
|
|
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
|
|
|