From: Zoltán Böszörményi <zboszor@gmail.com>
Date: Tue, 12 Oct 2021 11:17:26 +0000 (+0200)
Subject: libpam: Fix build with DISTRO_FEATURES usrmerge
X-Git-Tag: uninative-3.5~1241
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=71780bb9ac3c9e096888128d9cf3441c1758d816;p=openembedded-core.git

libpam: Fix build with DISTRO_FEATURES usrmerge

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb
index a3c4a50cb3..ee3a84a3b6 100644
--- a/meta/recipes-extended/pam/libpam_1.5.2.bb
+++ b/meta/recipes-extended/pam/libpam_1.5.2.bb
@@ -147,8 +147,10 @@ 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
-        install -d ${D}/${libdir}/
-	mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+	if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+		install -d ${D}/${libdir}/
+		mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
+	fi
 }
 
 do_install_ptest() {