From 78f528763b9d011e3f86a4976e49e2e6866348d4 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sun, 19 Aug 2007 21:11:15 +0000
Subject: [PATCH] libpcap cleanup

---
 package/libpcap/Config.in  |  1 +
 package/libpcap/libpcap.mk | 21 ++++++---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in
index 7aa6a5b5b1..894ab36418 100644
--- a/package/libpcap/Config.in
+++ b/package/libpcap/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPCAP
 	bool "libpcap"
+	select BR2_PACKAGE_ZLIB
 	default n
 	help
 	  A system-independent library for user-level network packet capture.
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 7e2f7ca872..0b1267a16d 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libpcap 
+# libpcap
 #
 #############################################################
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
@@ -48,20 +48,10 @@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--with-build-cc="$(HOSTCC)" \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
 		--disable-yydebug \
-		--prefix=/usr \
 		--with-pcap=linux \
 		$(DISABLE_IPV6) \
 	)
@@ -76,8 +66,9 @@ $(STAGING_DIR)/usr/lib/libpcap.a: $(LIBPCAP_DIR)/libpcap.a
 libpcap: uclibc zlib $(STAGING_DIR)/usr/lib/libpcap.a
 
 libpcap-clean:
-	rm -f $(STAGING_DIR)/usr/include/pcap*.h \
-		$(STAGING_DIR)/usr/lib/libpcap.a
+	rm -f $(addprefix $(STAGING_DIR)/usr/,include/pcap*.h \
+					      lib/libpcap.a \
+					      share/man/man?/pcap.*)
 	-$(MAKE) -C $(LIBPCAP_DIR) clean
 
 libpcap-dirclean:
-- 
2.30.2