2 files changed, 13 insertions, 11 deletions
diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index f2386f1070..21fb6c7d8f 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = 1
 
@@ -16,3 +16,8 @@ EXTRA_OECONF = "--disable-gtk-doc"
 do_stage() {
 autotools_stage_all
 }
+
+
+PACKAGES += libmimedir-utils
+FILES_libmimedir-utils = "${bindir}"
+FILES_${PN} = "${libdir}"
diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb
index 5be7074f35..bbdfd4f24a 100644
--- a/packages/libmimedir/libmimedir_cvs.bb
+++ b/packages/libmimedir/libmimedir_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r0"
+PR = "r1"
 PV = "0.3.1+cvs-${CVSDATE}"
 
 DEFAULT_PREFERENCE = -1
@@ -15,14 +15,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-marshal.h mimedir-period.h mimedir-profile.h mimedir-recurrence.h mimedir-utils.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h"
-
 do_stage() {
-	install -d ${STAGING_INCDIR}/mimedir-1.0/mimedir
-	for i in ${headers}; do
-		install -m 0644 ${S}/mimedir/$i ${STAGING_INCDIR}/mimedir-1.0/mimedir/$i
-	done
-
-	oe_libinstall -so -C mimedir libmimedir-0.2 ${STAGING_LIBDIR}
-	ln -sf libmimedir-0.2.so ${STAGING_LIBDIR}/libmimedir.so
+	autotools_stage_all
 }
+
+PACKAGES += libmimedir-utils
+FILES_libmimedir-utils = "${bindir}"
+FILES_${PN} = "${libdir}"
+