libxsettings-client: don't overwrite do_install from autotools, append to it

* also use INC_PR in _svn.bb
* remove unneeded install calls from old do_stage (it's already installed from
  make install)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/libxsettings-client/libxsettings-client.inc b/recipes/libxsettings-client/libxsettings-client.inc
index d999f8c..d758d6d 100644 (file)
--- a/recipes/libxsettings-client/libxsettings-client.inc
+++ b/recipes/libxsettings-client/libxsettings-client.inc
@@ -9,16 +9,10 @@ RDEPENDS_${PN}-dev += " libxsettings-dev"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit autotools pkgconfig gpe
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2"
 
-headers = "xsettings-client.h"
-
-do_install () {
-        oe_libinstall -so libXsettings-client ${D}${libdir}
-        install -d ${D}${includedir}
-        for h in ${headers}; do
-               install -m 0644 ${S}/$h ${D}${includedir}/$h
-        done
+do_install_append () {
+        rm ${D}/${includedir}/xsettings-common.h
 }

diff --git a/recipes/libxsettings-client/libxsettings-client_svn.bb b/recipes/libxsettings-client/libxsettings-client_svn.bb
index 5c4d338..e6a8303 100644 (file)
--- a/recipes/libxsettings-client/libxsettings-client_svn.bb
+++ b/recipes/libxsettings-client/libxsettings-client_svn.bb
@@ -2,7 +2,7 @@ require libxsettings-client.inc
 
 DEPENDS += "gtk-doc"
 PV = "0.17+svn${SRCDATE}"
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"