aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-06-06 14:05:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-06-06 14:05:29 +0000
commit9dffa9ee1008697f7e3183ff477b6d054a4b563d (patch)
tree9cecf7fc58969425b4a3ad29aa7cee4cb352aa60
parent8b25f0eb12bb1956f3513a099169c97374bc2c9c (diff)
downloadupstream-9dffa9ee1008697f7e3183ff477b6d054a4b563d.tar.gz
upstream-9dffa9ee1008697f7e3183ff477b6d054a4b563d.tar.bz2
upstream-9dffa9ee1008697f7e3183ff477b6d054a4b563d.zip
AA: firewall: backport r36868 (#13653)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36870 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/firewall/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index a54ffc1359..9c05e34bed 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/firewall
@@ -40,9 +39,7 @@ define Package/firewall/conffiles
endef
define Build/Configure
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext.a)
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext4.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext4.a)
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext6.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext6.a)
+ $(foreach file,$(wildcard $(STAGING_DIR)/usr/lib/iptables/libext*.a),$(CP) $(file) $(PKG_BUILD_DIR)/$(notdir $(file));)
$(call Build/Configure/Default)
endef