1 files changed, 7 insertions, 4 deletions

diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
index ce3f691b2c..1b0af5549a 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
@@ -74,11 +74,14 @@ do_compile_prepend () {
         sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool
 }
 do_install_append() {
-        if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then
-                install -D -m 0644 \
-                ${D}${libdir}/systemd/system/boinc-client.service \
+        if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then
+                install -d ${D}${systemd_system_unitdir}
+                mv \
+                ${D}${nonarch_libdir}/systemd/system/boinc-client.service \
                 ${D}${systemd_system_unitdir}/boinc-client.service
-                rm -rf ${D}${libdir}/systemd
+                rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/system \
+                ${D}${nonarch_libdir}/systemd \
+                ${D}${nonarch_libdir}
         fi
 }