shadow: fix libintl/libiconv dependencies

Include nls.mk rather than explicitly using the stub versions.
This allows to make the packages depend on the full versions
of libiconv & libintl and thus to have full language support.

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>

diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile
index 2bab53615535b12ef4110b7b3af3f8b4a7fb3a71..0899248a293fb79b6f9dda27047c8cfea482197b 100644 (file)
--- a/utils/shadow/Makefile
+++ b/utils/shadow/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadow
 PKG_VERSION:=4.2.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases
@@ -21,9 +21,8 @@ PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_BUILD_DEPENDS:=libintl libiconv
-
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 SHADOW_APPLETS := \
        chage groupadd groupdel groupmod groups passwd su \
@@ -93,6 +92,7 @@ Package/shadow-utils/description = $(Package/shadow/description)
 define Package/shadow-common
   $(call Package/shadow/Default)
   TITLE:=Shared definitions for the PLD Linux shadow utilities
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
   HIDDEN:=1
 endef