Patchwork libcap: pass prefix to "make install"

login
register
mail settings
Submitter Phil Blundell
Date July 14, 2011, 2:45 p.m.
Message ID <1310654732.2378.65.camel@phil-desktop>
Download mbox | patch
Permalink /patch/7597/
State New, archived
Headers show

Comments

Phil Blundell - July 14, 2011, 2:45 p.m.
Otherwise it will use /usr by default which may not be the right place.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-support/libcap/libcap.inc     |    2 +-
 meta/recipes-support/libcap/libcap_2.20.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - July 19, 2011, 6:43 p.m.
On 07/14/2011 07:45 AM, Phil Blundell wrote:
> Otherwise it will use /usr by default which may not be the right place.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/recipes-support/libcap/libcap.inc     |    2 +-
>   meta/recipes-support/libcap/libcap_2.20.bb |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
> index 3bff3b9..efa46d6 100644
> --- a/meta/recipes-support/libcap/libcap.inc
> +++ b/meta/recipes-support/libcap/libcap.inc
> @@ -29,7 +29,7 @@ do_compile() {
>   }
>
>   do_install() {
> -	oe_runmake install DESTDIR="${D}"
> +	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
>   }
>
>   # pam files
> diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb
> index c9741c2..a2b49c6 100644
> --- a/meta/recipes-support/libcap/libcap_2.20.bb
> +++ b/meta/recipes-support/libcap/libcap_2.20.bb
> @@ -1,6 +1,6 @@
>   require libcap.inc
>
> -PR = "r2"
> +PR = "r3"
>
>   SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
>   SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"

Merged into oe-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 3bff3b9..efa46d6 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -29,7 +29,7 @@  do_compile() {
 }
 
 do_install() {
-	oe_runmake install DESTDIR="${D}"
+	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
 }
 
 # pam files
diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb
index c9741c2..a2b49c6 100644
--- a/meta/recipes-support/libcap/libcap_2.20.bb
+++ b/meta/recipes-support/libcap/libcap_2.20.bb
@@ -1,6 +1,6 @@ 
 require libcap.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
 SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"