- use correct installation path

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 6165c962e011b43c144762a6dcdb3a1c8ea9b2c3..46ed81cd1ad1c40818ef6595e39353d17af28c03 100644 (file)
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -37,14 +37,13 @@ $(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
        toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ \*.patch
        touch $@
 
+# XXX: FIXME: put the argus ac_cv_lbl_unaligned_fail setting to som commonly
+# seen place and introduce TARGET_CONFIGURE_HINTS or the like!
 $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
-       ( \
-               cd $(LIBPCAP_DIR) ; \
+       (cd $(LIBPCAP_DIR) ; rm -rf config.cache ; \
                ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
                BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
@@ -53,33 +52,33 @@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
                --exec-prefix=/usr \
                --bindir=/usr/bin \
                --sbindir=/usr/sbin \
-               --libdir=/lib \
+               --libdir=/usr/lib \
                --libexecdir=/usr/lib \
                --sysconfdir=/etc \
                --datadir=/usr/share \
                --localstatedir=/var \
-               --includedir=/include \
+               --includedir=/usr/include \
                --mandir=/usr/man \
                --infodir=/usr/info \
                --with-build-cc="$(HOSTCC)" \
                --disable-yydebug \
                --prefix=/usr \
                --with-pcap=linux \
+               $(DISABLE_IPV6) \
        )
        touch $@
 
 $(LIBPCAP_DIR)/libpcap.a: $(LIBPCAP_DIR)/.configured
-       $(MAKE) CC="$(TARGET_CC)" \
-               AR="$(TARGET_CROSS)ar" \
-               -C $(LIBPCAP_DIR)
+       $(MAKE) AR=$(TARGET_CROSS)ar -C $(LIBPCAP_DIR)
 
-$(STAGING_DIR)/lib/libpcap.a: $(LIBPCAP_DIR)/libpcap.a
+$(STAGING_DIR)/usr/lib/libpcap.a: $(LIBPCAP_DIR)/libpcap.a
        $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPCAP_DIR) install
 
-libpcap: uclibc zlib $(STAGING_DIR)/lib/libpcap.a
+libpcap: uclibc zlib $(STAGING_DIR)/usr/lib/libpcap.a
 
 libpcap-clean:
-       rm -f $(STAGING_DIR)/include/pcap*.h $(STAGING_DIR)/lib/libpcap.a
+       rm -f $(STAGING_DIR)/usr/include/pcap*.h \
+               $(STAGING_DIR)/usr/lib/libpcap.a
        -$(MAKE) -C $(LIBPCAP_DIR) clean
 
 libpcap-dirclean: