make libintl and libiconv stub/full implementations switchable, use the new include...

[openwrt/svn-archive/packages.git] / net / gmediaserver / Makefile

diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile
index 90798969d8ca583f4d46444ae4ce1df8b535521a..ab51e33b9b98369428d396361c6bf05fec372fdc 100644 (file)
--- a/net/gmediaserver/Makefile
+++ b/net/gmediaserver/Makefile
@@ -19,11 +19,12 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gmediaserver
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+id3lib +libiconv +libmagic +file +libupnp +libuuid +uclibcxx +zlib
+  DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +uclibcxx +zlib $(ICONV_DEPENDS)
   TITLE:=An UPnP music media server
   URL:=http://www.nongnu.org/gmediaserver/
   SUBMENU:=multimedia
@@ -39,7 +40,7 @@ endef
 CONFIGURE_ARGS += \
        --disable-rpath \
        --enable-threads=posix \
-       --with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
+       --with-libiconv-prefix="$(ICONV_PREFIX)" \
        --without-libintl-prefix \
        --with-id3lib="$(STAGING_DIR)/usr" \
        --with-libupnp="$(STAGING_DIR)/usr" \