From 04899c330de0560f128e259acf10ace42f1c1c1e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 13 Dec 2016 11:17:11 +0000 Subject: rmc: don't hardcode install paths Instead of hardcoding /usr in the recipe, and hardcoding $prefix/lib in the Makefile, override all of the paths with the distro configuration. [ YOCTO #10800 ] Signed-off-by: Ross Burton Signed-off-by: California Sullivan --- common/recipes-bsp/rmc/rmc.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'common/recipes-bsp') diff --git a/common/recipes-bsp/rmc/rmc.bb b/common/recipes-bsp/rmc/rmc.bb index 8c89a99c..f5c648d8 100644 --- a/common/recipes-bsp/rmc/rmc.bb +++ b/common/recipes-bsp/rmc/rmc.bb @@ -22,6 +22,11 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*" TARGET_CFLAGS +="-Wl,--hash-style=both" +EXTRA_OEMAKE = "RMC_INSTALL_PREFIX=${D}/${prefix} \ + RMC_INSTALL_BIN_PATH=${D}${bindir} \ + RMC_INSTALL_LIB_PATH=${D}${libdir} \ + RMC_INSTALL_HEADER_PATH=${D}${includedir}/rmc" + SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong" do_compile_class-target() { oe_runmake @@ -29,8 +34,8 @@ do_compile_class-target() { } do_install() { - oe_runmake RMC_INSTALL_PREFIX=${D}/usr install - oe_runmake RMC_INSTALL_PREFIX=${D}/usr -f Makefile.efi install + oe_runmake install + oe_runmake -f Makefile.efi install } do_install_class-native() { -- cgit v1.2.3-54-g00ecf