X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d0dbee9899edf0ba58bd75b8cd1727b09e1142fd..ffbd3e61655e48e3485b22dca727ffce3786fdd5:/package/iptables/Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 34e681743..f8f590991 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.5
@@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_MENU:=IPv4 / IPv6 firewall administration
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config
-include $(TOPDIR)/target/linux/netfilter.mk
+-include $(LINUX_DIR)/.config
+include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Package/iptables
@@ -35,6 +35,11 @@ TITLE:=IPv4 firewall administration tool
 URL:=http://netfilter.org/
 endef
 
+define Package/iptables/conffiles
+/etc/config/firewall
+/etc/firewall.user
+endef
+
 define Package/iptables-mod-conntrack
 SECTION:=net
 CATEGORY:=Base system
@@ -45,7 +50,6 @@ Includes: \\\
 	* libipt_conntrack \\\
 	* libipt_helper \\\
 	* libipt_connmark/CONNMARK
-
 endef
 
 define Package/iptables-mod-filter
@@ -57,7 +61,6 @@ DESCRIPTION:=iptables extensions for packet content inspection\\\
 Includes: \\\
 	* libipt_ipp2p \\\
 	* libipt_layer7 
-						
 endef
 
 define Package/iptables-mod-imq
@@ -68,7 +71,6 @@ TITLE:=IMQ support
 DESCRIPTION:=iptables extension for IMQ support\\\
 Includes: \\\
 	* libipt_IMQ
-						
 endef
 
 define Package/iptables-mod-ipopt
@@ -86,7 +88,6 @@ Includes: \\\
 	* libipt_tcpmms \\\
 	* libipt_ttl/TTL \\\
 	* libipt_unclean 
-
 endef
 
 define Package/iptables-mod-ipsec
@@ -98,7 +99,6 @@ DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
 Includes: \\\
 	* libipt_ah \\\
 	* libipt_esp
-
 endef
 
 define Package/iptables-mod-nat
@@ -133,7 +133,6 @@ Includes: \\\
 	* libipt_physdev \\\
 	* libipt_pkttype \\\
 	* libipt_recent
-
 endef
 
 define Package/iptables-utils