From 475ddd8fba6a458c7117f2d39a5a2a7c3bc112c2 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 8 Oct 2019 11:14:08 +0300
Subject: [PATCH] libffi: make header fixes less yucky

---
 extra/libffi/build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extra/libffi/build b/extra/libffi/build
index ee26a3f0..ed40bd99 100755
--- a/extra/libffi/build
+++ b/extra/libffi/build
@@ -2,15 +2,16 @@
 
 ./configure \
     --prefix=/usr \
+    --includedir=/usr/include \
     --with-pic
 
 make
 make DESTDIR="$1" install
 
 # Fix location for headers.
-mkdir -p "$1/usr/include"
-mv    "$1/usr/lib/libffi-3.2.1/include/"*.h "$1/usr/include"
-rmdir "$1/usr/lib/libffi-3.2.1/include"
+mv    "$1/usr/lib/libffi-3.2.1/include/" "$1/usr"
+rmdir "$1/usr/lib/libffi-3.2.1"
 
+# Fix location inside pkgconfig file.
 sed -i -e '/^includedir=/{s,=.*,=/usr/include,g}' \
     "$1/usr/lib/pkgconfig/libffi.pc"