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 <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 105e6fbdd28238cef41f280c0c28939b24d1a96e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-extended/pam/libpam_1.6.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb
index b9ef564f5648fa1d14aaf55e7a3fba2d586cee65..c9ef40bf23493e97422de40ac08d688c4aadfa52 100644 (file)
--- a/meta/recipes-extended/pam/libpam_1.6.1.bb
+++ b/meta/recipes-extended/pam/libpam_1.6.1.bb
@@ -155,7 +155,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