aria2: moved to github

[packages.git] / net / bitlbee / Makefile

diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 85675a3..d3af024 100644 (file)
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,16 +1,15 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bitlbee
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://get.bitlbee.org/src \
@@ -18,19 +17,17 @@ PKG_SOURCE_URL:=http://get.bitlbee.org/src \
        http://get.us.bitlbee.org/src \
        http://ftp.snt.utwente.nl/pub/software/bitlbee/src
 PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=libopenssl glib1 libiconv
+PKG_BUILD_DEPENDS:=libopenssl glib1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/bitlbee
   SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +glib1 +libiconv
+  DEPENDS:=+libopenssl +glib1 $(ICONV_DEPENDS)
   TITLE:=IRC gateway to IM chat networks
   URL:=http://www.bitlbee.org/
 endef
@@ -45,8 +42,8 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                STAGING_DIR="$(STAGING_DIR)" \
                STRIP="$(STRIP)" \
                ./configure \
@@ -67,11 +64,11 @@ define Build/Configure
        );
        $(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\
                $(PKG_BUILD_DIR)/Makefile.settings
-       @echo 'CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include' >> \
+       @echo 'CFLAGS+=-I$(ICONV_PREFIX)/include' >> \
                $(PKG_BUILD_DIR)/Makefile.settings
-       @echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib' >> \
+       @echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \
                $(PKG_BUILD_DIR)/Makefile.settings
-       @echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib' >> \
+       @echo 'LFLAGS+=-L$(ICONV_PREFIX)/lib' >> \
                $(PKG_BUILD_DIR)/Makefile.settings
 endef
 
@@ -81,9 +78,9 @@ endef
 
 define Package/bitlbee/install
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(1)" install-etc install-bin 
+               DESTDIR="$(1)" install-etc install-bin
        $(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \
-               DESTDIR="$(1)" install 
+               DESTDIR="$(1)" install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/bitlbee.init $(1)/etc/init.d/bitlbee
 endef