From e7ad92decb7025d76e2e8b2bc15349d548c8ad14 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 27 Apr 2017 14:00:25 +0800 Subject: 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 Signed-off-by: Martin Jansa --- meta-gnome/recipes-gnome/evince/evince_3.24.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-gnome') 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 2b75244fe5..aae8e719ad 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 ??= "" -- cgit 1.2.3-korg