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 a3c4a50cb3f3e866ba6002756fc9a737aa866b06..ee3a84a3b6b9ed397527415087417edc52b5b9ae 100644 (file)
--- 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() {