From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 17 Jul 2011 15:01:51 +0000 (+0000)
Subject: [backfire] merge r27646
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=96c3348ec7532352a04730823197af4eba86d3b1

[backfire] merge r27646

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27647 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index b83c3a066..aec031921 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.4.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MD5SUM:=c67cf30e281a924def6426be0973df56
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -342,7 +342,9 @@ endef
 
 define Package/iptables-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-multi $(1)/usr/sbin/
+	$(LN) iptables-multi $(1)/usr/sbin/iptables-save
+	$(LN) iptables-multi $(1)/usr/sbin/iptables-restore
 endef
 
 define Package/ip6tables/install
@@ -356,7 +358,9 @@ endef
 
 define Package/ip6tables-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-multi $(1)/usr/sbin/
+	$(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-save
+	$(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-restore
 endef
 
 define Package/libiptc/install