From 6883f65588c6aa7e9780ff7c11b15a397382a422 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 10 Dec 2006 22:45:41 +0000
Subject: libcap: Append include directory to CFLAGS.  Reenables compilation
 and fixes 1628. Seizing the opportunity to remove some cruft and beautify the
 bb. RP approved.

---
 packages/libcap/libcap_1.10.bb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/libcap/libcap_1.10.bb b/packages/libcap/libcap_1.10.bb
index 7e3b89ae82..0526f63bb0 100644
--- a/packages/libcap/libcap_1.10.bb
+++ b/packages/libcap/libcap_1.10.bb
@@ -4,17 +4,15 @@ SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native"
 
-SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/libcap-${PV}.tar.bz2 \
+CFLAGS_append = " -I${S}/libcap/include"
+
+SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
 	   file://makenames.patch;patch=1 \
 	   file://make.patch;patch=1 "
 
-S = "${WORKDIR}/libcap-${PV}"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/sys
-	install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/
-	oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR}
-}
+FILES_${PN} = "${libdir}"
+FILES_${PN}-dev = "${includedir}"
+#S = "${WORKDIR}/libcap-${PV}"
 
 do_install() {
 	install -d ${D}${includedir}/sys
@@ -23,5 +21,8 @@ do_install() {
 	oe_libinstall -s -C libcap libcap ${D}${libdir}
 }
 
-FILES_${PN} = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
+do_stage() {
+	install -d ${STAGING_INCDIR}/sys
+	install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/
+	oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR}
+}
-- 
cgit 1.2.3-korg