fix typo in UnistallDev

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ee0c094..822be99 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -19,10 +19,6 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
@@ -38,7 +34,6 @@ endef
 
 define Package/iptables
   $(call Package/iptables/Default)
-  DEFAULT:=y
   TITLE:=IPv4 firewall administration tool
   MENU:=1
 endef
@@ -75,7 +70,7 @@ endef
 
 define Package/iptables-mod-imq
   $(call Package/iptables/Default)
-  DEPENDS:=iptables
+  DEPENDS:=iptables +kmod-ipt-imq
   TITLE:=IMQ support
   DESCRIPTION:=\
        iptables extension for IMQ support.\\\
@@ -92,6 +87,7 @@ define Package/iptables-mod-ipopt
        iptables extensions for matching/changing IP packet options.\\\
        \\\
        Includes: \\\
+       - libipt_CLASSIFY \\\
        - libipt_dscp/DSCP \\\
        - libipt_ecn/ECN \\\
        - libipt_length \\\
@@ -163,7 +159,11 @@ define Package/ip6tables
   TITLE:=IPv6 firewall administration tool
 endef
 
+$(PKG_BUILD_DIR)/.configured: $(LINUX_DIR)/.config
+
 define Build/Configure
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               clean
 endef
 
 define Build/Compile
@@ -174,7 +174,7 @@ define Build/Compile
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install install-devel
+               all install
 endef
 
 define Build/InstallDev
@@ -183,39 +183,48 @@ define Build/InstallDev
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
                DESTDIR="$(STAGING_DIR)" \
-               install install-devel
+               install-devel
+       $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr
+       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/usr/lib
 endef
 
 define Build/UninstallDev
        rm -rf $(STAGING_DIR)/usr/include/libipq.h
+       rm -rf $(STAGING_DIR)/usr/include/libipulog
+       rm -rf $(STAGING_DIR)/usr/include/libipq
+       rm -rf $(STAGING_DIR)/usr/include/libiptc
+       rm -rf $(STAGING_DIR)/usr/include/linux/netfilter*
+       rm -rf $(STAGING_DIR)/usr/include/iptables*
+       rm -rf $(STAGING_DIR)/usr/include/ip6tables*
        rm -rf $(STAGING_DIR)/usr/lib/libipq.a
+       rm -rf $(STAGING_DIR)/usr/lib/libiptc.a
 endef
 
 define Package/iptables/install
-       install -d -m0755 $(1)/etc/config
-       install -m0644 ./files/firewall.config $(1)/etc/config/firewall
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/firewall.init $(1)/etc/init.d/firewall
-       install -m0755 ./files/firewall.user $(1)/etc/
-       install -d -m0755 $(1)/usr/lib
-       install -m0644 ./files/firewall.awk $(1)/usr/lib
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
+       $(INSTALL_BIN) ./files/firewall.user $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
-       install -d -m0755 $(1)/usr/lib/iptables
+       $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
        )
 endef
 
 define Package/iptables-utils/install
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
 endef
 
 define Package/ip6tables/install
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
-       install -d -m0755 $(1)/usr/lib/iptables
+       $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
        )
@@ -223,7 +232,7 @@ endef
 
 define BuildPlugin
   define Package/$(1)/install
-       install -m0755 -d $$(1)/usr/lib/iptables
+       $(INSTALL_DIR) $$(1)/usr/lib/iptables
        for m in $$(patsubst xt_%,ipt_%,$(2)); do \
                $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \
        done
@@ -233,7 +242,8 @@ define BuildPlugin
   $$(eval $$(call BuildPackage,$(1)))
 endef
 
-L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+L7_INSTALL:=\
+       $(INSTALL_DIR) $$(1)/etc/l7-protocols; \
        $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
 $(eval $(call BuildPackage,iptables))