[packages_10.03.1] merge r27845

[openwrt/svn-archive/archive.git] / libs / libnetfilter-conntrack / Makefile

diff --git a/libs/libnetfilter-conntrack/Makefile b/libs/libnetfilter-conntrack/Makefile
index c228228291ac62b7f60e715ab9e69ca2ff72c88d..690b9ac1a6907628db9fe28d58573a72c0b9d8ca 100644 (file)
--- a/libs/libnetfilter-conntrack/Makefile
+++ b/libs/libnetfilter-conntrack/Makefile
@@ -1,35 +1,41 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnetfilter_conntrack
-PKG_VERSION:=0.0.99
+PKG_VERSION:=0.9.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/
-PKG_MD5SUM:=960c3d347d7f4e3fe7437aa198f36e6e
+PKG_SOURCE_URL:= \
+       http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \
+       ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/
+PKG_MD5SUM:=b7506cbb7580433859809d8eac53a199
+
+PKG_FIXUP:=libtool
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnetfilter-conntrack
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nf-conntrack-netlink
+  DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nf-conntrack-netlink
   TITLE:=API to the in-kernel connection tracking state table
   URL:=http://www.netfilter.org/projects/libnetfilter_conntrack/
 endef
 
 define Package/libnetfilter-conntrack/description
- libnetfilter_conntrack is a userspace library providing a programming 
- interface (API) to the in-kernel connection tracking state table. The 
- library libnetfilter_conntrack has been previously known as 
- libnfnetlink_conntrack and libctnetlink. This library is currently 
+ libnetfilter_conntrack is a userspace library providing a programming
+ interface (API) to the in-kernel connection tracking state table. The
+ library libnetfilter_conntrack has been previously known as
+ libnfnetlink_conntrack and libctnetlink. This library is currently
  used by conntrack-tools among many other applications.
 endef
 
@@ -39,12 +45,6 @@ CONFIGURE_ARGS += \
        --enable-static \
        --enable-shared \
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_conntrack
        $(CP) \