Patchwork guilt-native: eliminate hardcoded "/usr" in do_install

login
register
mail settings
Submitter Phil Blundell
Date May 17, 2011, 10:34 a.m.
Message ID <1305628454.2429.187.camel@phil-desktop>
Download mbox | patch
Permalink /patch/4231/
State New, archived
Headers show

Comments

Phil Blundell - May 17, 2011, 10:34 a.m.
For some reason guilt-native seems to have gone out of its way to refer explicitly to /usr, which breaks on micro. 
Let's use ${prefix} instead.

---
 meta/recipes-devtools/guilt/guilt-native_0.33.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - May 17, 2011, 2:01 p.m.
On Tue, 2011-05-17 at 11:34 +0100, Phil Blundell wrote:
> For some reason guilt-native seems to have gone out of its way to refer explicitly to /usr, which breaks on micro. 
> Let's use ${prefix} instead.
> 
> ---
>  meta/recipes-devtools/guilt/guilt-native_0.33.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
> index 6261330..7d0246e 100644
> --- a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
> +++ b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
> @@ -28,5 +28,5 @@ do_compile() {
>  }
> 
>  do_install() {
> -       oe_runmake PREFIX=${D}/${base_prefix}/usr install
> +       oe_runmake PREFIX=${D}/${prefix} install
>  }
> 

Merged to mast thanks.

(again, whitespace on this was corrupted)

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
index 6261330..7d0246e 100644
--- a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
@@ -28,5 +28,5 @@  do_compile() {
 }

 do_install() {
-       oe_runmake PREFIX=${D}/${base_prefix}/usr install
+       oe_runmake PREFIX=${D}/${prefix} install
 }