[oe-commits] Roy Li : netcf: align the systemd file path with Makefile

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: a08da4f6030e77d9647785b4c6f3ee9199a51c35
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a08da4f6030e77d9647785b4c6f3ee9199a51c35

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Aug 11 17:19:04 2015 +0800

netcf: align the systemd file path with Makefile

systemd service file is installed under ${prefix}/lib/ which is not same
as ${libdir}, so align the path with Makefile, and remove it if it is not
same as ${libdir}

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-support/netcf/netcf_git.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
index d47bb3b..19e85a0 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -11,7 +11,6 @@ PV = "0.2.8+git${SRCPV}"
 
 SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
 "
-
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
 
 S = "${WORKDIR}/git"
@@ -32,8 +31,11 @@ do_configure_prepend() {
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        install -d ${D}${systemd_unitdir}/system
-       mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
-       rm -rf ${D}${libdir}/systemd/
+       mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_unitdir}/system/
+       rm -rf ${D}${prefix}/lib/systemd
+       if [ $libdir != ${prefix}/lib ]; then
+          rm -rf ${D}${prefix}/lib/
+       fi
     else
        mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
        rm -rf ${D}${sysconfdir}/rc.d/