[oe-commits] Chen Qi : systemd: fix to use ${libdir} for libraries

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6beeccb81416b0a7af6a4b19cb641f0d66a7198a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6beeccb81416b0a7af6a4b19cb641f0d66a7198a

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Mon Sep 15 10:05:03 2014 +0800

systemd: fix to use ${libdir} for libraries

We need to use ${libdir} instead of ${exec_prefix}/lib for libraries.
Otherwise, we would meet do_install errors if multilib is enabled.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/systemd/systemd_216.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index bd52891..331da99 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -129,7 +129,7 @@ do_install() {
 	fi
 
 	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev*
+	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
 
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
@@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${rootlibexecdir}/systemd/* \
                 ${systemd_unitdir}/* \
                 ${base_libdir}/security/*.so \
-                ${exec_prefix}/lib/libnss_* \
+                ${libdir}/libnss_* \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/busctl \