From: Phil Blundell <philb@gnu.org>
Date: Mon, 24 Sep 2012 21:43:05 +0000 (+0100)
Subject: libcap: Fix erroneous path in last commit
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32785ae0656aa2f541824e902d49292c6ebab9d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libcap: Fix erroneous path in last commit

The directory used as SBINDIR should be ${sbindir} not ${base_sbindir}.
Reported by Martin Jansa <martin.jansa@gmail.com>

(From OE-Core rev: 2c6725c1f8427a0920c2810d649010f98b7869eb)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index bfaeffd746d..27552ad49b9 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -43,7 +43,7 @@ do_compile() {
 }
 
 do_install() {
-	oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${base_sbindir}"
+	oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${sbindir}"
 }
 
 do_install_append() {
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index d57c102fef8..560bd69c9b6 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
 require libcap.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
 SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"