diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-10-18 20:29:42 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-10-18 20:40:01 +0200 |
| commit | 11690abe689e3cf86a9ba64a57063eab59040714 (patch) | |
| tree | c16a586ddcd08802f4d0f144a438a2afaa10bf81 /recipes/libxsettings-client | |
| parent | 121b15fdfaa8a08b39b9abcf9ed20a72854692ab (diff) | |
| download | openembedded-11690abe689e3cf86a9ba64a57063eab59040714.tar.gz | |
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>
Diffstat (limited to 'recipes/libxsettings-client')
| -rw-r--r-- | recipes/libxsettings-client/libxsettings-client.inc | 12 | ||||
| -rw-r--r-- | recipes/libxsettings-client/libxsettings-client_svn.bb | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/recipes/libxsettings-client/libxsettings-client.inc b/recipes/libxsettings-client/libxsettings-client.inc index d999f8c997..d758d6dd09 100644 --- 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 5c4d338366..e6a8303d34 100644 --- 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}" |