[OE-core] [PATCH 37/42] avahi-ui: Fix usage of systemd unitdir vars

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 3966b4c..0ab1e38 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -41,11 +41,9 @@ RDEPENDS_python-avahi = "python-core python-dbus"
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
 	rm ${D}${base_libdir} -rf
-	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
-	# whithout systemd.
-	[ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
+	rm ${D}${systemd_system_unitdir} -rf
+	rm ${D}${nonarch_base_libdir}/systemd -rf
+	[ ! -d ${D}${nonarch_base_libdir} ] || rmdir ${D}${nonarch_base_libdir} --ignore-fail-on-non-empty
 	rm ${D}${bindir}/avahi-b*
 	rm ${D}${bindir}/avahi-p*
 	rm ${D}${bindir}/avahi-r*
-- 
2.7.1