[OE-core] [PATCH] cmake: install path variables should be relative to the prefix path

[Jack Mitchell]

From: Jack Mitchell <j...@embed.me.uk>

---
 meta/classes/cmake.bbclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index b18152a..2375d09 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -108,15 +108,15 @@ cmake_do_configure() {
          ${OECMAKE_SITEFILE} \
          ${OECMAKE_SOURCEPATH} \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-         -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
-         -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \
-         -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
-         -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
-         -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir} \
-         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
-         -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
-         -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir} \
+         -DCMAKE_INSTALL_BINDIR:PATH=${bindir#${prefix}/} \
+         -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir#${prefix}/} \
+         -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir#${prefix}/} \
+         -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir#${prefix}/} \
+         -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir#${prefix}/} \
+         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir#${prefix}/} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${libdir#${prefix}/} \
+         -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir#${prefix}/} \
+         -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir#${prefix}/} \
          -DCMAKE_INSTALL_SO_NO_EXE=0 \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          -DCMAKE_VERBOSE_MAKEFILE=1 \
-- 
2.9.3

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core