fixes for common config functions

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index f47b936..f8f5909 100644 (file)
--- 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
@@ -50,7 +50,6 @@ Includes: \\\
        * libipt_conntrack \\\
        * libipt_helper \\\
        * libipt_connmark/CONNMARK
-
 endef
 
 define Package/iptables-mod-filter
@@ -62,7 +61,6 @@ DESCRIPTION:=iptables extensions for packet content inspection\\\
 Includes: \\\
        * libipt_ipp2p \\\
        * libipt_layer7 
-                                               
 endef
 
 define Package/iptables-mod-imq
@@ -73,7 +71,6 @@ TITLE:=IMQ support
 DESCRIPTION:=iptables extension for IMQ support\\\
 Includes: \\\
        * libipt_IMQ
-                                               
 endef
 
 define Package/iptables-mod-ipopt
@@ -91,7 +88,6 @@ Includes: \\\
        * libipt_tcpmms \\\
        * libipt_ttl/TTL \\\
        * libipt_unclean 
-
 endef
 
 define Package/iptables-mod-ipsec
@@ -103,7 +99,6 @@ DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
 Includes: \\\
        * libipt_ah \\\
        * libipt_esp
-
 endef
 
 define Package/iptables-mod-nat
@@ -138,7 +133,6 @@ Includes: \\\
        * libipt_physdev \\\
        * libipt_pkttype \\\
        * libipt_recent
-
 endef
 
 define Package/iptables-utils