[oe-commits] [meta-openembedded] 02/02: evince: fix do_install problem

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit e7ad92decb7025d76e2e8b2bc15349d548c8ad14
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Thu Apr 27 14:00:25 2017 +0800

    evince: fix do_install problem
    
    When building evince for multilib, we would meet the following do_install
    error.
    
      mv: cannot stat [snip]/usr/lib64/systemd/user/evince.service: No such file or directory
    
    Fix to use the correct directory related to systemd in do_install function.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-gnome/recipes-gnome/evince/evince_3.24.0.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
index 2b75244..aae8e71 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
@@ -30,12 +30,13 @@ do_install_append() {
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
     then
         install -d ${D}${systemd_unitdir}/system
-        mv ${D}${libdir}/systemd/user/evince.service ${D}${systemd_unitdir}/system/evince.service
+        mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service
     else
         rm -rf ${D}${libdir}/systemd/user/evince.service
     fi
-    rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd/user
-    rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd
+    rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir}
+    rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd
+    rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
 }
 
 PACKAGECONFIG ??= ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.