From 218bcaeb8d356b3420d203c205f0dd5bab283552 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:39:02 +0200 Subject: avahi: use new gettext logic This commit switches to use the new gettext logic, which involves: - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies on gettext/host-gettext - using TARGET_NLS_LIBS to force linking against libintl - dropping BR2_PACKAGE_GETTEXT selection Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/avahi/avahi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/avahi/avahi.mk') diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index a356a08291..94b6292b5d 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -97,8 +97,8 @@ AVAHI_CONF_OPTS = \ --with-autoipd-group=avahi AVAHI_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \ - host-pkgconf host-gettext + host-intltool host-pkgconf \ + $(TARGET_NLS_DEPENDENCIES) AVAHI_CFLAGS = $(TARGET_CFLAGS) @@ -168,7 +168,7 @@ endif AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" -AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl) +AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) define AVAHI_USERS avahi -1 avahi -1 * - - - -- cgit v1.2.1