remove iconv dependancy when not absolutely required

[openwrt/svn-archive/archive.git] / net / weechat / Makefile

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index f0e8101fbc0dda4367cc12c26a95ed3fee512e03..b4fbf973036650c03fde2b76c388f8ef7bc11c6c 100644 (file)
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.0
+PKG_VERSION:=0.2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
-PKG_MD5SUM:=69c292237bebd4b7a1ff29c0f9c76380
+PKG_MD5SUM:=c7c7f89d6dac502ad31d12198a8836c1
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/weechat
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libncurses +liblua +libgnutls
+  DEPENDS:=+libiconv +libncurses +liblua +libgnutls
   TITLE:=Lightweight IRC client
   DESCRIPTION:=\
        Weechat is fast, light & extensible IRC client.
@@ -37,7 +37,7 @@ define Build/Configure
                --with-debug=0 \
                --with-libgnutls-prefix=$(STAGING_DIR)/usr \
                --without-doc-xsl-prefix \
-               --without-libiconv-prefix \
+               --with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
                --without-libintl-prefix \
                --disable-aspell \
                --enable-lua \
@@ -46,6 +46,8 @@ define Build/Configure
                --disable-perl \
                --disable-python \
                --disable-ruby \
+               , \
+               LIBS="-llua -ldl -lm -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
        )
 endef
 
@@ -56,9 +58,9 @@ define Build/Compile
 endef
 
 define Package/weechat/install 
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
-       install -d -m0755 $(1)/usr/lib/weechat/plugins
+       $(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/lua.so* $(1)/usr/lib/weechat/plugins/
 endef