From: Chris Packham <judge.packham@gmail.com>
Date: Fri, 30 Oct 2009 17:04:10 +0000 (-0400)
Subject: libpcap: always make install for the staging dir
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9c0d809d4de4e59c80debbd41fa71464b9d256b;p=buildroot.git

libpcap: always make install for the staging dir

So that the headers get installed in the staging directory for other packages
that need to use them.

[Peter: tweaked whitespace changes]
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/CHANGES b/CHANGES
index b99f11d654..6af8cd6cca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 2010.02, Not yet released:
 
 	Updated/fixed packages: autoconf, bind, binutils, busybox, iw,
-	lighttpd, mesa, pcre, usbutils
+	libpcap, lighttpd, mesa, pcre, usbutils
 
 	Issues resolved (http://bugs.uclibc.org):
 
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 272d646b3f..dc72924e93 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -11,8 +11,8 @@ LIBPCAP_INSTALL_STAGING:=YES
 # doesn't have an install-strip
 LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
 	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
-LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" \
-	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
+LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
+	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
 LIBPCAP_DEPENDENCIES:=zlib
 LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS)))))
 LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux