utils.bbclass: restore previous implementation of explode_deps()

[openembedded.git] / recipes / avahi / avahi.inc

diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc
index f5e68e2..150fa99 100644 (file)
--- a/recipes/avahi/avahi.inc
+++ b/recipes/avahi/avahi.inc
@@ -14,7 +14,7 @@ RDEPENDS_avahi-autoipd += "update-rc.d"
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://00avahi-autoipd file://99avahi-autoipd"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d python-dir
 # handle update-rc.d RDEPENDS manually, we don't need it on
 # anything but avahi-daemon and avahi-autoipd
 RDEPENDS_append = ""
@@ -25,7 +25,7 @@ AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
 LDFLAGS_append_linux-uclibc = " -lintl"
-LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_linux-uclibceabi = " -lintl "
 LDFLAGS_append_uclinux-uclibc = " -lintl"
 
 PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
@@ -52,7 +52,7 @@ FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
                        ${sysconfdir}/udhcpc.d/*avahi-autoipd"
-FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
+FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*"
 FILES_avahi-discover = "${bindir}/avahi-discover \
                         ${datadir}/applications/avahi-discover.desktop \
                         ${datadir}/avahi/interfaces/avahi-discover.glade"