From 3e86310a64a769622ea8066c967bf0bad6be70e7 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Fri, 14 Sep 2018 11:58:20 +0200
Subject: libp11: Fix paths after switch to openssl 1.1.

It should now accept paths in either format to accommodate openssl
versions 1.0 and 1.1.
---
 recipes-support/libp11/libp11_0.4.7.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb
index 02d9e50..00074e5 100644
--- a/recipes-support/libp11/libp11_0.4.7.bb
+++ b/recipes-support/libp11/libp11_0.4.7.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 # Currently, Makefile dependencies are incorrectly defined which causes build errors
-# The number of jobs is high
+# if the number of jobs is high
 # See https://github.com/OpenSC/libp11/issues/94
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-static"
@@ -28,12 +28,12 @@ do_install_append () {
     rm -rf ${D}${docdir}/${BPN}
 }
 
-FILES_${PN} = "${libdir}/engines/pkcs11.so \
-               ${libdir}/engines/libpkcs11${SOLIBS} \
+FILES_${PN} = "${libdir}/engines*/pkcs11.so \
+               ${libdir}/engines*/libpkcs11${SOLIBS} \
                ${libdir}/libp11${SOLIBS}"
 
 FILES_${PN}-dev = " \
-                   ${libdir}/engines/libpkcs11${SOLIBSDEV} \
+                   ${libdir}/engines*/libpkcs11${SOLIBSDEV} \
                    ${libdir}/libp11${SOLIBSDEV} \
                    ${libdir}/pkgconfig/libp11.pc \
                    /usr/include"
-- 
cgit v1.2.3-54-g00ecf