From: Andrea Adami Date: Fri, 19 Nov 2010 22:59:02 +0000 (+0100) Subject: libgpepimc: correctly install libgpepimc.pc file X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7953bc1414ce19e76cde6095770379fd6bdceb8e;p=openembedded.git libgpepimc: correctly install libgpepimc.pc file * by removing now superfluous custom do_install task * fix build of libtododb and libcontactsdb * bump PR Acked-by: Andreas Oberritter Signed-off-by: Andrea Adami --- diff --git a/recipes/libgpepimc/libgpepimc.inc b/recipes/libgpepimc/libgpepimc.inc index ec775df341..fdf659149b 100644 --- a/recipes/libgpepimc/libgpepimc.inc +++ b/recipes/libgpepimc/libgpepimc.inc @@ -10,12 +10,12 @@ SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" inherit pkgconfig autotools -headers = "pim-categories.h pim-categories-ui.h" +#headers = "pim-categories.h pim-categories-ui.h" -do_install () { - oe_libinstall -so libgpepimc ${D}${libdir} - install -d ${D}${includedir}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h - done -} +#do_install () { +# oe_libinstall -so libgpepimc ${D}${libdir} +# install -d ${D}${includedir}/gpe +# for h in ${headers}; do +# install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h +# done +#} diff --git a/recipes/libgpepimc/libgpepimc_0.9.bb b/recipes/libgpepimc/libgpepimc_0.9.bb index 0ca28320ba..688b85095f 100644 --- a/recipes/libgpepimc/libgpepimc_0.9.bb +++ b/recipes/libgpepimc/libgpepimc_0.9.bb @@ -1,5 +1,5 @@ require libgpepimc.inc -PR = "r1" +PR = "r2" SRC_URI += " file://get-category-by-name.patch" diff --git a/recipes/libgpepimc/libgpepimc_svn.bb b/recipes/libgpepimc/libgpepimc_svn.bb index 621ac39917..45d30f59bf 100644 --- a/recipes/libgpepimc/libgpepimc_svn.bb +++ b/recipes/libgpepimc/libgpepimc_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "libgpewidget gtk+ sqlite" PROVIDES = "libgepepimc" RPROVIDES_${PN} = "libgepepimc" PV = "0.8+svn${SRCDATE}" -PR = "r2" +PR = "r3" SRC_URI = "${GPE_SVN}" @@ -16,12 +16,4 @@ inherit pkgconfig autotools headers = "pim-categories.h pim-categories-ui.h" -do_install () { - oe_libinstall -so libgpepimc ${D}${libdir} - install -d ${D}${includedir}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h - done -} - DEFAULT_PREFERENCE = "-1"