nginx: Add openssl dependency. Also fix parallel build.

[openwrt/svn-archive/archive.git] / net / conntrack-tools / Makefile

diff --git a/net/conntrack-tools/Makefile b/net/conntrack-tools/Makefile
index 322cae52d313d0b159c88037a7c8e842b4e6be4e..b0757078bebe85b909b8180afc98d44bda88356e 100644 (file)
--- a/net/conntrack-tools/Makefile
+++ b/net/conntrack-tools/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conntrack-tools
-PKG_VERSION:=0.9.12
+PKG_VERSION:=0.9.14
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.netfilter.org/projects/conntrack-tools/files/
-PKG_MD5SUM:=a082eb2354d12250a3f81363440b73f3
+PKG_SOURCE_URL:= \
+       http://www.netfilter.org/projects/conntrack-tools/files/ \
+       ftp://ftp.netfilter.org/pub/conntrack-tools/ \
+       http://mirrors.evolva.ro/netfilter.org/conntrack-tools/
+PKG_MD5SUM:=7e9344fe85bb68bcf65c35034add6655
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -39,20 +43,11 @@ define Package/conntrack-tools/conffiles
 /etc/conntrackd/conntrackd.conf
 endef
 
-
-# uses GNU configure
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Package/conntrack-tools/install
        $(INSTALL_DIR) $(1)/etc/conntrackd
        $(INSTALL_CONF) \
                $(PKG_BUILD_DIR)/doc/stats/conntrackd.conf \
-               $(1)/etc/conntrackd
+               $(1)/etc/conntrackd/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/sbin/conntrack \