remove spurious spaces

[openwrt.git] / openwrt / package / iptables / Makefile

diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index 29dcf6c..e40fa8e 100644 (file)
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -4,11 +4,14 @@ include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 
 PKG_NAME:=iptables
 include kernelconfig.mk
 
 PKG_NAME:=iptables

-PKG_VERSION:=1.3.1
+PKG_VERSION:=1.3.3

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=c3358a3bd0d7755df0b64a5063db296b
+PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4

 
 

-PKG_SOURCE_URL:=http://www.netfilter.org/files
+PKG_SOURCE_URL:=http://www.netfilter.org/files \
+       ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
+       ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
+       ftp://ftp.no.netfilter.org/pub/netfilter/iptables/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 


@@ -22,6 +25,9 @@ $(eval $(call PKG_template,IPTABLES_EXTRA,iptables-extra,$(PKG_VERSION)-$(PKG_RE
 $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+

 $(PKG_BUILD_DIR)/.built:
        chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test
        mkdir -p $(PKG_INSTALL_DIR)
 $(PKG_BUILD_DIR)/.built:
        chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test
        mkdir -p $(PKG_INSTALL_DIR)


@@ -31,7 +37,7 @@ $(PKG_BUILD_DIR)/.built:
                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install install-devel
                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install install-devel

-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

                
 $(IPKG_IPTABLES):
        install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
                
 $(IPKG_IPTABLES):
        install -d -m0755 $(IDIR_IPTABLES)/usr/sbin


@@ -68,6 +74,7 @@ $(IPKG_IP6TABLES):
        $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
        $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built

+       mkdir -p $(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/lib/

        cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
 
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
 


@@ -77,5 +84,5 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/libipq.h
        rm -rf $(STAGING_DIR)/usr/lib/libipq.a
 
        rm -rf $(STAGING_DIR)/usr/include/libipq.h
        rm -rf $(STAGING_DIR)/usr/lib/libipq.a
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev