[scripts] metadata.pl: fix a bug where dependency flags (@ and +) from a dependency...

[openwrt.git] / package / ipset / Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b06a727..b7b4a31 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -1,26 +1,27 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 #
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=2.2.3
+PKG_VERSION:=3.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
+PKG_MD5SUM:=0fd83af3efae5f72f5e5b55d07582941
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipset
   SECTION:=net
   CATEGORY:=Network
+  DEPENDS:=@!TARGET_etrax @LINUX_2_6
   TITLE:=Netfilter ip sets administration utility
   URL:=http://ipset.netfilter.org/
 endef
@@ -28,8 +29,11 @@ endef
 define Build/Compile
        $(call Build/Compile/Default, \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="-rdynamic -static-libgcc" \
                KERNEL_DIR="$(LINUX_DIR)" \
                PREFIX="/usr" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               binaries \
        )
 endef
 
@@ -37,7 +41,7 @@ define Package/ipset/install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(1)" \
                PREFIX="/usr" \
-               install
+               binaries_install
        rm -rf $(1)/usr/man
 endef