8b2694efb7
* fix build for openssl 1.1.1b required for sdk (cherry picked from commit aa49e3b2755b97b6331cdbbb89efc954de8d5977) * use js code from master * fix openssl recipe and tweak build (cherry picked from commit 6e94c27021c7bd7b1e880c2fc314850e36a5a38e) * remove unused build recipes (cherry picked from commit f5c0577bdb175bfc0990602936bbc9e2052e1f25)
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
|
|
From: Yen Chi Hsuan <yan12125@gmail.com>
|
|
Date: Sun, 13 Nov 2016 19:17:19 +0800
|
|
Subject: [PATCH] Install public headers in the standard path
|
|
|
|
---
|
|
include/Makefile.am | 3 +--
|
|
libffi.pc.in | 2 +-
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/Makefile.am b/include/Makefile.am
|
|
index bb241e88..c59df9fb 100644
|
|
--- a/include/Makefile.am
|
|
+++ b/include/Makefile.am
|
|
@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
|
|
noinst_HEADERS=ffi_common.h ffi_cfi.h
|
|
EXTRA_DIST=ffi.h.in
|
|
|
|
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
|
|
-nodist_includes_HEADERS = ffi.h ffitarget.h
|
|
+nodist_include_HEADERS = ffi.h ffitarget.h
|
|
diff --git a/libffi.pc.in b/libffi.pc.in
|
|
index edf6fde5..6fad83b4 100644
|
|
--- a/libffi.pc.in
|
|
+++ b/libffi.pc.in
|
|
@@ -2,7 +2,7 @@ prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
toolexeclibdir=@toolexeclibdir@
|
|
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
|
|
+includedir=@includedir@
|
|
|
|
Name: @PACKAGE_NAME@
|
|
Description: Library supporting Foreign Function Interfaces
|