libpcap cleanup

diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in
index 7aa6a5b5b1fe8039b9ae8dd8ae8670c864ab968e..894ab3641800f7c1506ad4fdce06f8c6be623efb 100644 (file)
--- 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 7e2f7ca8721585abbcd3a0de6a8f244f1f8ed5b1..0b1267a16db18eee7d8a752034ee34d9c92c5103 100644 (file)
--- 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: