[oe-commits] [meta-openembedded] 46/58: 16/17] open-vm-tools: fix all hardcoded paths

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 873d2aa77377d4145263ea6bb772d18940e39a78
Author: Martin Kelly <mkelly at xevo.com>
AuthorDate: Fri Jun 23 15:48:47 2017 -0700

    16/17] open-vm-tools: fix all hardcoded paths
    
    Signed-off-by: Martin Kelly <mkelly at xevo.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
index 4ab2820..2a83e86 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
@@ -56,15 +56,15 @@ PACKAGECONFIG[fuse] = ",,fuse"
 CFLAGS += "-Wno-error=deprecated-declarations"
 
 FILES_${PN} += "\
-    /usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \
-    /usr/lib/open-vm-tools/plugins/common/lib*.so \
+    ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \
+    ${libdir}/open-vm-tools/plugins/common/lib*.so \
     ${sysconfdir}/vmware-tools/tools.conf \
     "
-FILES_${PN}-locale += "/usr/share/open-vm-tools/messages"
-FILES_${PN}-dev += "/usr/lib/open-vm-tools/plugins/common/lib*.la"
+FILES_${PN}-locale += "${datadir}/open-vm-tools/messages"
+FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la"
 FILES_${PN}-dbg += "\
-    /usr/lib/open-vm-tools/plugins/common/.debug \
-    /usr/lib/open-vm-tools/plugins/vmsvc/.debug \
+    ${libdir}/open-vm-tools/plugins/common/.debug \
+    ${libdir}/open-vm-tools/plugins/vmsvc/.debug \
     "
 
 CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
@@ -72,7 +72,7 @@ CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf"
 RDEPENDS_${PN} = "util-linux libdnet fuse"
 
 do_install_append() {
-    ln -sf /usr/sbin/mount.vmhgfs ${D}/sbin/mount.vmhgfs
+    ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs
     install -d ${D}${systemd_unitdir}/system ${D}${sysconfdir}/vmware-tools
     install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.