[package] update radvd to 1.5, select kmod-ipv6 (#5966)

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

diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 224ca9fdd1b5bd91dd81fbda5b7e7f2372fef58e..45e915a0a11813e4af4cc7da14097ceb85f90810 100644 (file)
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -18,15 +17,13 @@ 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
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bitlbee
+  SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libopenssl +glib1 +libiconv
@@ -44,8 +41,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 \
@@ -64,13 +61,17 @@ define Build/Configure
                        --glib1=1 \
                        --glib1prefix="$(STAGING_DIR)/usr" \
        );
+       $(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\
+               $(PKG_BUILD_DIR)/Makefile.settings
+       @echo 'CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include' >> \
+               $(PKG_BUILD_DIR)/Makefile.settings
+       @echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \
+               $(PKG_BUILD_DIR)/Makefile.settings
+       @echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib' >> \
+               $(PKG_BUILD_DIR)/Makefile.settings
 endef
 
 define Build/Compile
-       @echo 'CFLAGS+="-I$(STAGING_DIR)/usr/lib/libiconv/include"' >> \
-               $(PKG_BUILD_DIR)/Makefile.settings
-       @echo 'LFLAGS+="-L$(STAGING_DIR)/usr/lib/libiconv/lib"' >> \
-               $(PKG_BUILD_DIR)/Makefile.settings
        $(MAKE) -C $(PKG_BUILD_DIR)
 endef