From: Sergey Bostandzhyan <jin@mediatomb.org>
Date: Thu, 30 Aug 2007 12:50:46 +0000 (+0000)
Subject: image-magick: fix staging and packaging, closes #2892
X-Git-Tag: Release-2010-05/1~8776^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de372333d013c8cf7674c9032a16d29b92f0a7b9;p=openembedded.git

image-magick: fix staging and packaging, closes #2892
---

diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb
index 33748a005e..a403e1a629 100644
--- a/packages/imagemagick/imagemagick_6.2.9.bb
+++ b/packages/imagemagick/imagemagick_6.2.9.bb
@@ -7,8 +7,9 @@ SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \
 	   file://PerlMagic_MakePatch;patch=1"
 
 S = "${WORKDIR}/ImageMagick-${PV}"
+PR="r1"
 
-inherit autotools
+inherit autotools binconfig
 
 EXTRA_OECONF="--without-x"
 EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
@@ -16,7 +17,17 @@ EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
 LEAD_SONAME="libMagick.so.*"
 
 FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
+        ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
 		${libdir}/ImageMagick-${PV}/config/ \
 		${datadir}/ImageMagick-${PV}"
 
 FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
+
+do_stage() {
+    oe_libinstall -so -a libMagick ${STAGING_LIBDIR}
+    oe_libinstall -so -a libWand ${STAGING_LIBDIR}
+    install -d ${STAGING_INCDIR}/wand/
+    install -d ${STAGING_INCDIR}/magick/
+    install -m 0644 wand/*.h ${STAGING_INCDIR}/wand/
+    install -m 0644 magick/*.h ${STAGING_INCDIR}/magick/
+}