[COMMUNITY] BSP's should not ship files in /usr/local/

 * replace /usr/local with path /usr/share/renesas using:
   RENESAS_DATADIR = "/usr"
   - meta-rcar-gen3/include/rcar-gen3-path-common.inc

Bug-AGL: SPEC-533

Change-Id: I865ea809c3c59ba136027fc8b99628df20c16275
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>

24 files changed, 72 insertions, 56 deletions

diff --git a/meta-rcar-gen3/include/rcar-gen3-modules-common.inc b/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
index 7eb7a3c..7cd0845 100644
--- a/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
+++ b/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
@@ -6,3 +6,4 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
 export KERNELDIR = "${STAGING_KERNEL_DIR}"
 export LDFLAGS = ""
 export CP = "cp"
+require include/rcar-gen3-path-common.inc
diff --git a/meta-rcar-gen3/include/rcar-gen3-path-common.inc b/meta-rcar-gen3/include/rcar-gen3-path-common.inc
new file mode 100644
index 0000000..d01a044
--- /dev/null
+++ b/meta-rcar-gen3/include/rcar-gen3-path-common.inc
@@ -0,0 +1 @@
+export RENESAS_DATADIR = "/usr"
diff --git a/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb b/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb
index 9d9b101..8fb0198 100644
--- a/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb
+++ b/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb
@@ -9,7 +9,7 @@ PR = "r0"
 S = "${WORKDIR}/git"
 QOSIF_TP_DIR = "qos_if-tp-user/files/qos_if"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${QOSIF_TP_DIR}
@@ -18,10 +18,10 @@ do_compile() {
 
 do_install() {
     # Create destination directory
-    install -d ${D}/usr/local/bin/
+    install -d ${D}${RENESAS_DATADIR}/bin/
 
     # Copy user test program
-    install -m 755 ${S}/${QOSIF_TP_DIR}/qos_tp ${D}/usr/local/bin/
+    install -m 755 ${S}/${QOSIF_TP_DIR}/qos_tp ${D}${RENESAS_DATADIR}/bin/
 }
 
 PACKAGES = " \
@@ -29,8 +29,8 @@ PACKAGES = " \
     ${PN}-dbg \
 "
 
-FILES_${PN} = "/usr/local/bin/qos_tp"
+FILES_${PN} = "${RENESAS_DATADIR}/bin/qos_tp"
 
 FILES_${PN}-dbg = " \
-    /usr/local/bin/.debug/* \
+    ${RENESAS_DATADIR}/bin/.debug/* \
 "
diff --git a/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb b/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb
index d2871f2..c836fe3 100644
--- a/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb
+++ b/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb
@@ -11,7 +11,7 @@ QOSIF_LIB_DIR = "qos_if-module/files/qos_if"
 
 EXTRA_OEMAKE = "ARCH=${TARGET_ARCH}"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     # Build shared library
diff --git a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
index 5ea1596..33a2d55 100644
--- a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
+++ b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Linux ICCOM library test applications for Renesas R-Car Gen3"
 
 require iccom-user-module.inc
 require include/multimedia-control.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = " \
     kernel-module-iccom-mfis \
@@ -32,20 +33,20 @@ do_compile() {
 
 do_install() {
     # Create destination directory
-    install -d ${D}/usr/local/bin
+    install -d ${D}${RENESAS_DATADIR}/bin
 
     # Install test applications
-    install -m 755 ${S}/sample_test/sample_test ${D}/usr/local/bin/
-    install -m 755 ${S}/sample_test_fatal/sample_test_fatal ${D}/usr/local/bin/
-    install -m 755 ${S}/sample_sharedmem/sample_sharedmem ${D}/usr/local/bin/
-    install -m 755 ${S}/sample_lock/sample_lock ${D}/usr/local/bin/
+    install -m 755 ${S}/sample_test/sample_test ${D}${RENESAS_DATADIR}/bin/
+    install -m 755 ${S}/sample_test_fatal/sample_test_fatal ${D}${RENESAS_DATADIR}/bin/
+    install -m 755 ${S}/sample_sharedmem/sample_sharedmem ${D}${RENESAS_DATADIR}/bin/
+    install -m 755 ${S}/sample_lock/sample_lock ${D}${RENESAS_DATADIR}/bin/
 }
 
 FILES_${PN} = " \
-    /usr/local/bin/sample_test \
-    /usr/local/bin/sample_test_fatal \
-    /usr/local/bin/sample_sharedmem \
-    /usr/local/bin/sample_lock \
+    ${RENESAS_DATADIR}/bin/sample_test \
+    ${RENESAS_DATADIR}/bin/sample_test_fatal \
+    ${RENESAS_DATADIR}/bin/sample_sharedmem \
+    ${RENESAS_DATADIR}/bin/sample_lock \
 "
 
 # Skip debug split
diff --git a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
index a735271..dc269b8 100644
--- a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
+++ b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Linux ICCOM library for Renesas R-Car Gen3"
 
 require iccom-user-module.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = " \
     kernel-module-iccom-mfis \
@@ -19,13 +20,13 @@ B = "${S}/source"
 do_install() {
     # Create destination directories
     install -d ${D}/${libdir}
-    install -d ${D}/usr/local/include
+    install -d ${D}${RENESAS_DATADIR}/include
 
     # Install library
     install -m 755 ${B}/libiccom.so ${D}/${libdir}/
 
     # Install shared header file
-    install -m 644 ${S}/include/iccom_if_app.h ${D}/usr/local/include/
+    install -m 644 ${S}/include/iccom_if_app.h ${D}${RENESAS_DATADIR}/include/
 }
 
 FILES_${PN} = " \
@@ -33,7 +34,7 @@ FILES_${PN} = " \
 "
 
 FILES_${PN}-dev = " \
-    /usr/local/include/iccom_if_app.h \
+    ${RENESAS_DATADIR}/include/iccom_if_app.h \
 "
 
 # Skip debug split
diff --git a/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend b/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 0000000..ffec1e1
--- /dev/null
+++ b/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,5 @@
+require include/rcar-gen3-path-common.inc
+
+do_install_append () {
+    echo "export LD_LIBRARY_PATH=\"${RENESAS_DATADIR}/lib\"" >> ${D}${sysconfdir}/profile
+}
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
index 4195d67..ecc67b8 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
@@ -20,7 +20,7 @@ SRCREV = "72d7d19baa093e1a4f66780d6395977b6c981725"
 
 S = "${WORKDIR}/git"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_install_append() {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
index 82df7f2..857e55c 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
@@ -20,7 +20,7 @@ SRCREV = "45779953bd9069ffc8add30d247f87326a8f89e9"
 
 S = "${WORKDIR}/git"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_install_append() {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
index d76aad4..50d6d22 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
@@ -20,7 +20,7 @@ SRCREV = "df724a9a8b4594bcbb7bd3a3bae9bea06244a7d5"
 
 S = "${WORKDIR}/git"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 
 do_install_append () {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
index caf1fc3..691ba07 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
@@ -14,7 +14,7 @@ MMNGR_CFG_salvator-x = "MMNGR_SALVATORX"
 MMNGR_CFG_h3ulcb = "MMNGR_SALVATORX"
 MMNGR_CFG_m3ulcb = "MMNGR_SALVATORX"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 SSTATE_DUPWHITELIST += "${STAGING_INCDIR}"
 
 do_compile() {
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
index b0d0085..4f61ee6 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
@@ -9,7 +9,7 @@ PR = "r0"
 S = "${WORKDIR}/git"
 MMNGRBUF_DRV_DIR = "mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 SSTATE_DUPWHITELIST += "${STAGING_INCDIR}"
 
 do_compile() {
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
index dea0abe..2210245 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
@@ -23,7 +23,7 @@ SRC_URI = "${QOS_DRV_URL};branch=${BRANCH}"
 S = "${WORKDIR}/git"
 QOS_DRV_DIR = "qos-module/files/qos/drv"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${QOS_DRV_DIR}/
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
index fa02d79..b12c1de 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
     file://src/cmn/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
 "
 require include/omx-control.inc
+require include/rcar-gen3-path-common.inc
+
 inherit module
 PR = "r0"
 
@@ -23,7 +25,7 @@ EXTRA_OEMAKE += "CROSS_COMPILE=${CROSS_COMPILE}"
 
 B="${S}/src/makefile"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile_prepend() {
     export UVCS_SRC="${S}/src"
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
index ccf2164..8145569 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
@@ -22,7 +22,7 @@ SRC_URI = "${VSPM_DRV_URL};branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 VSPM_DRV_DIR = "vspm-module/files/vspm"
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${VSPM_DRV_DIR}/drv
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
index 1ddd256..49be53f 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
@@ -24,7 +24,7 @@ SRC_URI = "${VSPMIF_DRV_URL};branch=${BRANCH}"
 S = "${WORKDIR}/git"
 VSPMIF_DRV_DIR = "vspm_if-module/files/vspm_if"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${VSPMIF_DRV_DIR}/drv
diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
index 5951a4c..36253d8 100644
--- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
+++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
@@ -14,7 +14,7 @@ DEPENDS = "kernel-module-avb-streaming libyaml"
 
 S = "${WORKDIR}/git/avb-demoapps"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 # submodule is extracted before do_populate_lic
 addtask do_init_submodule after do_unpack before do_patch
diff --git a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
index 76d96f8..55efa92 100644
--- a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
@@ -39,18 +39,18 @@ do_compile[noexec] = "1"
 do_install() {
     # Create destination folders
     install -d ${D}/${libdir}
-    install -d ${D}/usr/local/include
-    install -d ${D}/usr/local/src/dtv/reference
+    install -d ${D}${RENESAS_DATADIR}/include
+    install -d ${D}${RENESAS_DATADIR}/src/dtv/reference
 
     # Copy library
     install -m 644 ${S}/${baselib}/*.a ${D}/${libdir}/
 
     # Copy shared header files
-    install -m 644 ${S}/include/*.h ${D}/usr/local/include
+    install -m 644 ${S}/include/*.h ${D}${RENESAS_DATADIR}/include
 
     # Copy reference files
-    install -m 644 ${S}/userfunc/*.h ${D}/usr/local/src/dtv/reference
-    install -m 644 ${S}/userfunc/*.c ${D}/usr/local/src/dtv/reference
+    install -m 644 ${S}/userfunc/*.h ${D}${RENESAS_DATADIR}/src/dtv/reference
+    install -m 644 ${S}/userfunc/*.c ${D}${RENESAS_DATADIR}/src/dtv/reference
 }
 
 PACKAGES = " \
@@ -63,8 +63,8 @@ FILES_${PN} = ""
 ALLOW_EMPTY_${PN} = "1"
 
 FILES_${PN}-dev = " \
-    /usr/local/include/*.h \
-    /usr/local/src/dtv/reference/* \
+    ${RENESAS_DATADIR}/include/*.h \
+    ${RENESAS_DATADIR}/src/dtv/reference/* \
 "
 FILES_${PN}-staticdev = " \
     ${libdir}/*.a \
diff --git a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
index ff3633b..aead035 100644
--- a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
@@ -35,13 +35,13 @@ do_compile[noexec] = "1"
 do_install() {
     # Create destination folders
     install -d ${D}/${libdir}
-    install -d ${D}/usr/local/include
+    install -d ${D}${RENESAS_DATADIR}/include
 
     # Copy library
     install -m 644 ${S}/${baselib}/*.a ${D}/${libdir}
 
     # Copy shared header files
-    install -m 644 ${S}/include/*.h ${D}/usr/local/include
+    install -m 644 ${S}/include/*.h ${D}${RENESAS_DATADIR}/include
 }
 
 PACKAGES = " \
@@ -54,7 +54,7 @@ FILES_${PN} = ""
 ALLOW_EMPTY_${PN} = "1"
 
 FILES_${PN}-dev = " \
-    /usr/local/include/*.h \
+    ${RENESAS_DATADIR}/include/*.h \
 "
 FILES_${PN}-staticdev = " \
     ${libdir}/*.a \
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
index b22490e..ac4cf30 100644
--- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Memory Manager User module for Renesas R-Car Gen3"
 require mmngr_lib.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = "kernel-module-mmngr"
 PN = "mmngr-user-module"
@@ -11,13 +12,14 @@ EXTRA_OECONF =  "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \
     " --enable-mmngr-test", "", d)}"
 
 exec_prefix = "/usr"
-bindir = "/usr/local/bin"
-includedir = "/usr/local/include"
+bindir = "${RENESAS_DATADIR}/bin"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 
 do_install_append() {
-    if [ -f ${D}/usr/local/bin/mmtp ]; then
+    if [ -f ${D}${RENESAS_DATADIR}/bin/mmtp ]; then
         if [ X${WS} = "X32" ]; then
-            mv ${D}/usr/local/bin/mmtp ${D}/usr/local/bin/mmtp${WS}
+            mv ${D}${RENESAS_DATADIR}/bin/mmtp ${D}${RENESAS_DATADIR}/bin/mmtp${WS}
         fi
     fi
 }
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
index 916d567..690169f 100644
--- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Memory Manager Buffer User module for Renesas R-Car Gen3"
 require mmngr_lib.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = "kernel-module-mmngrbuf"
 PN = "mmngrbuf-user-module"
@@ -11,13 +12,14 @@ EXTRA_OECONF =  "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \
     " --enable-mmngrbuf-test", "", d)}"
 
 exec_prefix = "/usr"
-bindir = "/usr/local/bin"
-includedir = "/usr/local/include"
+bindir = "${RENESAS_DATADIR}/bin"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 
 do_install_append() {
-    if [ -f ${D}/usr/local/bin/mmbuftp ]; then
+    if [ -f ${D}${RENESAS_DATADIR}/bin/mmbuftp ]; then
         if [ X${WS} = "X32" ]; then
-            mv ${D}/usr/local/bin/mmbuftp ${D}/usr/local/bin/mmbuftp${WS}
+            mv ${D}${RENESAS_DATADIR}/bin/mmbuftp ${D}${RENESAS_DATADIR}/bin/mmbuftp${WS}
         fi
     fi
 }
diff --git a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
index 87a5937..08ea7b1 100644
--- a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
@@ -18,7 +18,8 @@ DEPENDS += '${@base_conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv",
 
 inherit autotools
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 OMX_EVA_PREFIX = '${@base_conditional("USE_OMX_EVA_PKG", "1", "EVA", "", d )}'
diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
index fb41431..a83d871 100644
--- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
@@ -20,15 +20,15 @@ do_compile() {
 
 do_install() {
     # Create destination folder
-    install -d ${D}/usr/local/bin/
+    install -d ${D}${RENESAS_DATADIR}/bin/
 
     # Copy user test program
     if [ X${WS} = "X32" ]; then
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}/usr/local/bin/vspm_tp32
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}/usr/local/bin/fdpm_tp32
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}${RENESAS_DATADIR}/bin/vspm_tp32
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}${RENESAS_DATADIR}/bin/fdpm_tp32
     else
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}/usr/local/bin/
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}/usr/local/bin/
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}${RENESAS_DATADIR}/bin/
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}${RENESAS_DATADIR}/bin/
     fi
 }
 
@@ -37,10 +37,10 @@ PACKAGES = "\
     ${PN}-dbg \
 "
 FILES_${PN} = " \
-    ${@base_conditional('WS', '32', '/usr/local/bin/vspm_tp32 /usr/local/bin/fdpm_tp32', \
-    '/usr/local/bin/vspm_tp /usr/local/bin/fdpm_tp', d)}"
+    ${@base_conditional('WS', '32', '${RENESAS_DATADIR}/bin/vspm_tp32 ${RENESAS_DATADIR}/bin/fdpm_tp32', \
+    '${RENESAS_DATADIR}/bin/vspm_tp ${RENESAS_DATADIR}/bin/fdpm_tp', d)}"
 
 FILES_${PN}-dbg = " \
-    /usr/local/bin/.debug/*"
+    ${RENESAS_DATADIR}/bin/.debug/*"
 
 RPROVIDES_${PN} += "vspmif-tp-user-module"
diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
index 3e47d1f..bf7fef6 100644
--- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
@@ -11,7 +11,7 @@ VSPMIF_LIB_DIR = "vspm_if-module/files/vspm_if"
 
 EXTRA_OEMAKE = "ARCH=${TARGET_ARCH}"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     export VSPM_LEGACY_IF="1"