From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 12 Nov 2005 11:53:55 +0000 (+0000)
Subject: port iptables fix introduced by changeset:2447 to trunk
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ddceeefc015b870a6da29341328392aa833510d8;p=openwrt%2Fstaging%2Fnbd.git

port iptables fix introduced by changeset:2447 to trunk

SVN-Revision: 2448
---

diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index f54481c05b..cdbb866a09 100644
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -75,7 +75,7 @@ $(IPKG_IPTABLES):
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
 	install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
 	(cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
-		cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y) ipt_standard) $(IDIR_IPTABLES)/usr/lib/iptables/ \
+		cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
 	)
 	$(RSTRIP) $(IDIR_IPTABLES)
 	$(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)
diff --git a/openwrt/target/linux/netfilter.mk b/openwrt/target/linux/netfilter.mk
index 64f4ced70c..3882a5ccb6 100644
--- a/openwrt/target/linux/netfilter.mk
+++ b/openwrt/target/linux/netfilter.mk
@@ -71,7 +71,7 @@ IPKG_KMOD_IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG
 #
 
 IPKG_IPTABLES-y := ipt_standard
-IPKG_IPTABLES-y := ipt_icmp ipt_tcp ipt_udp
+IPKG_IPTABLES-y += ipt_icmp ipt_tcp ipt_udp
 
 IPKG_IPTABLES_MOD_CONNTRACK-m :=
 IPKG_IPTABLES_MOD_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark