emacs: zlib is now in base_libdir

* moved in
  http://git.openembedded.org/openembedded-core/commit/?id=ebb8382af892bef8e11fb590292506e1124276c5

(From meta-openembedded rev: e23ede5137a35cc4c1ab16e909f522d7218b5597)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc b/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc
index 5068596..fa554ed 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc
@@ -94,6 +94,7 @@ do_compile_prepend() {
         # after:   86M   ../../qemu-treedir/
         cp -pPR \
         ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
+        ${STAGING_DIR_TARGET}/${base_libdir}/libz.so.* \
         ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
         ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
         ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
@@ -118,8 +119,7 @@ do_compile_prepend() {
         ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \
         ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \
         ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \
-        ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \
-        ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
+        ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* $treedir/${base_libdir}/
 
         # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
         cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/