fix vpi/vci setting for pppoa

[openwrt.git] / package / ipset / Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index d245090..3b53858 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 #
 include $(TOPDIR)/rules.mk
 # $Id$
 #
 include $(TOPDIR)/rules.mk


@@ -6,25 +12,34 @@ PKG_NAME:=ipset
 PKG_VERSION:=2.2.3
 PKG_RELEASE:=1
 
 PKG_VERSION:=2.2.3
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 PKG_CAT:=bzcat
 

-include $(TOPDIR)/include/package.mk
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk

 
 define Package/ipset
 
 define Package/ipset

-SECTION:=base
-CATEGORY:=Network
-TITLE:=Netfilter ip sets administration utility
-DESCRIPTION:=Netfilter ip sets administration utility
-URL:=http://ipset.netfilter.org/
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Netfilter ip sets administration utility
+  URL:=http://ipset.netfilter.org/
+endef
+
+define Build/Compile
+       $(call Build/Compile/Default, \
+               COPT_FLAGS="$(TARGET_CFLAGS)" \
+               KERNEL_DIR="$(LINUX_DIR)" \
+       )

 endef
 
 define Package/ipset/install
        $(MAKE) -C $(PKG_BUILD_DIR) \
 endef
 
 define Package/ipset/install
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               DESTDIR=$(1) PREFIX=/usr install
+               DESTDIR="$(1)" \
+               PREFIX="/usr" \
+               install

        rm -rf $(1)/usr/man
 endef
 
        rm -rf $(1)/usr/man
 endef