From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 21 May 2010 11:56:47 +0000 (+0400)
Subject: clamav: convert to new staging
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101eac534afed0302e2c8587b21293cce3eab12a;p=openembedded.git

clamav: convert to new staging

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---

diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index 91aca57497..5c91b448d3 100644
--- a/recipes/clamav/clamav.inc
+++ b/recipes/clamav/clamav.inc
@@ -18,7 +18,7 @@ RRECOMMENDS_${PN} = "${PN}-freshclam"
 RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
 RPROVIDES_${PN}-freshclam = "${PN}-data"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz;name=clamav-${PV} \
           file://clamav-daemon.init \
@@ -29,7 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz;name=clamav-${PV} \
           file://volatiles.03_clamav-daemon \
           file://volatiles.03_clamav-freshclam"
 
-inherit autotools update-rc.d binconfig
+inherit autotools update-rc.d binconfig pkgconfig
 
 # Don't check for clamav uid/gid - they don't exist on the host
 # Put virus definitions in /var/lib not /usr/lib
@@ -61,11 +61,6 @@ do_install_append() {
           install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
         done
 }
-do_stage () {
-        oe_libinstall -a -so libclamav ${STAGING_LIBDIR}
-        rm -f ${STAGING_LIBDIR}/libclamav.la
-        install -m 0644 libclamav/clamav.h ${STAGING_INCDIR}
-}
 
 PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \
              ${PN}-clamconf"