remove annoying package rm command

[openwrt.git] / package / ipset / Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 8369b29..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


@@ -5,30 +11,36 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ipset
 PKG_VERSION:=2.2.3
 PKG_RELEASE:=1
 PKG_NAME:=ipset
 PKG_VERSION:=2.2.3
 PKG_RELEASE:=1

-PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26

 
 

-PKG_SOURCE_URL:=http://ipset.netfilter.org

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2

-PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://ipset.netfilter.org
+PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26

 PKG_CAT:=bzcat
 
 PKG_CAT:=bzcat
 

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

 
 

-$(eval $(call PKG_template,IPSET,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+include $(INCLUDE_DIR)/package.mk

 
 

-$(PKG_BUILD_DIR)/.configured:
-       touch $@
+define Package/ipset
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Netfilter ip sets administration utility
+  URL:=http://ipset.netfilter.org/
+endef

 
 

-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-               CFLAGS="$(TARGET_CFLAGS) -Wall -I$(LINUX_DIR)/include -I." \
-               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr
-       touch $@
+define Build/Compile
+       $(call Build/Compile/Default, \
+               COPT_FLAGS="$(TARGET_CFLAGS)" \
+               KERNEL_DIR="$(LINUX_DIR)" \
+       )
+endef

 
 

-$(IPKG_IPSET):
+define Package/ipset/install

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
-       rm -rf $(IDIR_IPSET)/usr/man
-       $(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)
+               DESTDIR="$(1)" \
+               PREFIX="/usr" \
+               install
+       rm -rf $(1)/usr/man
+endef

 
 

+$(eval $(call BuildPackage,ipset))