fix kernel config item for 3c95x/vortex network cards (closes: #2441)

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index bd0ecda..0105530 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -195,6 +195,11 @@ define Package/ip6tables-utils
  TITLE:=ip6tables save and restore utilities
 endef
 
+define Build/Prepare
+       $(call Build/Prepare/Default)
+       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
+endef
+
 define Build/Configure
        rm -f $(PKG_BUILD_DIR)/.configured*
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -202,7 +207,6 @@ define Build/Configure
 endef
 
 define Build/Compile
-       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
@@ -218,22 +222,22 @@ define Build/InstallDev
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
-               DESTDIR="$(STAGING_DIR)" \
+               DESTDIR="$(1)" \
                install-devel
-       $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr
-       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr
+       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/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
+       rm -rf $(1)/usr/include/libipq.h
+       rm -rf $(1)/usr/include/libipulog
+       rm -rf $(1)/usr/include/libipq
+       rm -rf $(1)/usr/include/libiptc
+       rm -rf $(1)/usr/include/linux/netfilter*
+       rm -rf $(1)/usr/include/iptables*
+       rm -rf $(1)/usr/include/ip6tables*
+       rm -rf $(1)/usr/lib/libipq.a
+       rm -rf $(1)/usr/lib/libiptc.a
 endef
 
 define Package/iptables/install