diff options
| -rw-r--r-- | package/iptables/iptables.mk | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 22c5ea5c8..68ddc1a7e 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -3,38 +3,36 @@ # iptables # ############################################################# -IPTABLES_VER:=1.3.7 +IPTABLES_VERSION:=1.3.8 IPTABLES_SOURCE_URL:=ftp.netfilter.org/pub/iptables -IPTABLES_SOURCE:=iptables-$(IPTABLES_VER).tar.bz2 +IPTABLES_SOURCE:=iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_CAT:=$(BZCAT) -IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VER) +IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VERSION) $(DL_DIR)/$(IPTABLES_SOURCE): $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) $(IPTABLES_CAT) $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(IPTABLES_BUILD_DIR)/.unpacked + touch $@ $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked # Allow patches. Needed for openwrt for instance. toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables\*.patch # $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \ - $(STAGING_DIR)/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile - touch $(IPTABLES_BUILD_DIR)/.configured + $(STAGING_DIR)/usr/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile + touch $@ $(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE1) -C $(IPTABLES_BUILD_DIR) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ KERNEL_DIR=$(LINUX_HEADERS_DIR) PREFIX=/usr \ - CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" + COPT_FLAGS="$(TARGET_CFLAGS)" $(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE1) -C $(IPTABLES_BUILD_DIR) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ KERNEL_DIR=$(LINUX_HEADERS_DIR) PREFIX=/usr \ - CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ DESTDIR=$(TARGET_DIR) install $(STRIP) $(TARGET_DIR)/usr/sbin/iptables* $(STRIP) $(TARGET_DIR)/usr/lib/iptables/*.so |