merge of '0c4f9a61dfdb0b3267c7794453ccf15dbc4e600c'

     and 'd99679b234416670dd8c8e3c87704e7479b4a1e2'

3 files changed, 4 insertions, 23 deletions

diff --git a/packages/libgpevtype/libgpevtype_0.16.bb b/packages/libgpevtype/libgpevtype_0.16.bb
index 3f8af85beb..74f7bf312b 100644
--- a/packages/libgpevtype/libgpevtype_0.16.bb
+++ b/packages/libgpevtype/libgpevtype_0.16.bb
@@ -9,16 +9,7 @@ inherit pkgconfig gpe autotools
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
-headers = "tag-db.h vcard.h vevent.h vtodo.h"
-
-
 do_stage () {
-	oe_libinstall -so libgpevtype ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h}
-	done
+	autotools_stage_all
 }
 
-
diff --git a/packages/libgpevtype/libgpevtype_0.17.bb b/packages/libgpevtype/libgpevtype_0.17.bb
index f336b2c846..7c2ebf6b1d 100644
--- a/packages/libgpevtype/libgpevtype_0.17.bb
+++ b/packages/libgpevtype/libgpevtype_0.17.bb
@@ -15,12 +15,7 @@ headers = "tag-db.h vcard.h vevent.h vtodo.h"
 
 
 do_stage () {
-	oe_libinstall -so libgpevtype ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h}
-	done
+	autotools_stage_all
 }
 
 
diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb
index 5c7ca33fbb..213c009d85 100644
--- a/packages/libgpevtype/libgpevtype_svn.bb
+++ b/packages/libgpevtype/libgpevtype_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libmimedir libeventdb"
 PV = "0.17+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit pkgconfig gpe autotools
 
@@ -13,13 +13,8 @@ SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"
 
 do_stage () {
-        oe_libinstall -so libgpevtype ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}/gpe
-        for h in ${headers}; do
-                install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/${h}
-        done
+	autotools_stage_all
 }
 
-headers = "tag-db.h vcard.h vevent.h vtodo.h"
 
 DEFAULT_PREFERENCE = "-1"