From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 14 Jan 2010 18:55:42 +0000 (+0000)
Subject: [packages] conntrack-tools: update to v0.9.14 (#6466)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=fd6b9280c7b4ac16052ae9a5bd306f219b8264f1

[packages] conntrack-tools: update to v0.9.14 (#6466)


SVN-Revision: 19131
---

diff --git a/net/conntrack-tools/Makefile b/net/conntrack-tools/Makefile
index 30d33aaa01..50665fb29b 100644
--- 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,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conntrack-tools
-PKG_VERSION:=0.9.13
+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:=bd0e2149a1626071db83c4f9714e0556
+PKG_SOURCE_URL:=http://www.netfilter.org/projects/conntrack-tools/files
+PKG_MD5SUM:=7e9344fe85bb68bcf65c35034add6655
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -39,20 +40,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 \