[OE-core] [PATCH] avahi-ui: support usrmerge

[changqing.li at windriver.com]

From: Changqing Li <changqing.li at windriver.com>

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index a77653b..1c6e46a 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
@@ -20,7 +20,13 @@ FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
 
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
-	rm ${D}${base_libdir} -rf
+	if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+               if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
+                   rm ${D}${nonarch_base_libdir} -rf
+               fi
+        else
+		rm ${D}${base_libdir} -rf
+        fi
 	rm ${D}${systemd_unitdir} -rf
 	# The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
 	# but not ${base_libdir} here. And the /lib may not exist
-- 
2.7.4