[oe-commits] org.oe.dev merge of '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'

[koen commit]

merge of '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
     and 'f4febba2a3678a4948cda4320c543ed34a41ff68'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 592b476df2c8569826428b6d22ef478cda0a6b63
ViewMTN: http://monotone.openembedded.org/revision.psp?id=592b476df2c8569826428b6d22ef478cda0a6b63
Files:
1
packages/imagemagick/imagemagick_6.2.9.bb
Diffs:

#
# mt diff -r06fb345943334f939a5210e3a0e3c6d4edf0e6c1 -r592b476df2c8569826428b6d22ef478cda0a6b63
#
# 
# 
# patch "packages/imagemagick/imagemagick_6.2.9.bb"
#  from [58430bc8ddd421064b75441122f207447154fe23]
#    to [87dd6e551201320e8640f418eb13e43df104a02c]
# 
============================================================
--- packages/imagemagick/imagemagick_6.2.9.bb	58430bc8ddd421064b75441122f207447154fe23
+++ packages/imagemagick/imagemagick_6.2.9.bb	87dd6e551201320e8640f418eb13e43df104a02c
@@ -7,8 +7,9 @@ S = "${WORKDIR}/ImageMagick-${PV}"
 	   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 @@ FILES_${PN} += "${libdir}/ImageMagick-${
 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/
+}


#
# mt diff -rf4febba2a3678a4948cda4320c543ed34a41ff68 -r592b476df2c8569826428b6d22ef478cda0a6b63
#
# 
# no changes
#