From: Daniel McGregor Date: Wed, 13 Apr 2022 02:24:50 +0000 (-0600) Subject: libpam: use libdir in conditional X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdankm%2Fsstate;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git libpam: use libdir in conditional Using the usrmerge distro feature for this check causes the -native variant's build to fail. Simplify the test to be correct for both native and target builds. Signed-off-by: Daniel McGregor --- diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb index bde7fef8a26..1c97a169067 100644 --- a/meta/recipes-extended/pam/libpam_1.5.2.bb +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb @@ -148,7 +148,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + if [ "${base_libdir}" != "${libdir}" ]; then install -d ${D}/${libdir}/ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ fi