[package] get the enable/disable ipv6 configure option from the build system, do...

[openwrt/svn-archive/archive.git] / net / tcpdump / Makefile

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index befe7401aadaa45ae266c9c57e031629121056dd..41c88c86a005776dffd943493f14f0f84580bf8e 100644 (file)
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,16 +1,15 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 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:=tcpdump
 PKG_VERSION:=3.9.8
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
@@ -19,9 +18,6 @@ PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
        http://www.br.tcpdump.org/
 PKG_MD5SUM:=c491a78c52fe73f1f7271aa5d8c6ab2e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tcpdump
@@ -34,7 +30,6 @@ endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
-               --enable-ipv6 \
                --without-crypto \
                , \
                BUILD_CC="$(TARGET_CC)" \
@@ -45,14 +40,14 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" \
+               CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Package/tcpdump/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,tcpdump))