From 354e45a61f981e69a90a4a8d0b47e3b235eabaff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 11 Dec 2010 01:16:51 +0100
Subject: prepare pcap-config to be usable by other packages

---
 package/libpcap/Makefile                  |  3 ++-
 package/libpcap/patches/patch-Makefile_in | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 package/libpcap/patches/patch-Makefile_in

(limited to 'package/libpcap')

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index f51a3058f..caacf0e8c 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libpcap
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1bca27d206970badae248cfa471bbb47
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=	--disable-yydebug \
 			--with-pcap=linux
 TCFLAGS+=		${TCPPFLAGS}
 INSTALL_TARGET=		install install-shared
+MAKE_FLAGS+=		STAGING_DIR=$(STAGING_DIR)
 
 ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in
new file mode 100644
index 000000000..deb816cd6
--- /dev/null
+++ b/package/libpcap/patches/patch-Makefile_in
@@ -0,0 +1,13 @@
+--- libpcap-1.1.1.orig/Makefile.in	2010-04-05 19:54:05.000000000 +0200
++++ libpcap-1.1.1/Makefile.in	2010-12-08 23:30:21.000000000 +0100
+@@ -474,8 +474,8 @@ bpf_filter.o: bpf_filter.c
+ #
+ pcap-config: $(srcdir)/pcap-config.in
+ 	@rm -f $@ $@.tmp
+-	sed -e 's|@includedir[@]|$(includedir)|g' \
+-	    -e 's|@libdir[@]|$(libdir)|g' \
++	sed -e 's|@includedir[@]|$(STAGING_DIR)$(includedir)|g' \
++	    -e 's|@libdir[@]|$(STAGING_DIR)$(libdir)|g' \
+ 	    -e 's|@LIBS[@]|$(LIBS)|g' \
+ 	    -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \
+ 	    $(srcdir)/pcap-config.in >$@.tmp
-- 
cgit v1.2.3