Patchwork [11/14] avahi-ui: fix build with automake-1.11.2

login
mail settings
Submitter Nitin A Kamble
Date Dec. 30, 2011, 12:30 a.m.
Message ID <3e5d5b9badd569bb4d95d3b562b5f92ad4eb8383.1325204775.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/17797/
State Accepted
Commit d902580c21b8b80f3fb9d88faf46eae4d7b9c276
Headers show

Comments

Nitin A Kamble - Dec. 30, 2011, 12:30 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

With automake 1.11.2 /usr/lib/<pkgname> files are moved to
/usr/share/<pkgname>
Fix the rmdir in do_install which expect /usr/lib/avahi to exist.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
index c903087..bcc1f41 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
@@ -6,7 +6,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 require avahi.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 DEPENDS += "avahi gtk+ libglade"
 
@@ -50,7 +50,6 @@  do_install_append () {
 	rm ${D}${libdir}/libavahi-g*
 	rm ${D}${libdir}/pkgconfig/avahi-c*
 	rm ${D}${libdir}/pkgconfig/avahi-g*
-	rmdir ${D}${libdir}/avahi
 	rm ${D}${sbindir} -rf
 	rm ${D}${datadir}/avahi/a*
 	rm ${D}${datadir}/avahi/s*