From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 29 Mar 2016 19:11:26 +0000 (-0400)
Subject: vstart: fix up cmake paths when VSTART_DEST is given
X-Git-Tag: v10.1.1~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8363%2Fhead;p=ceph.git

vstart: fix up cmake paths when VSTART_DEST is given

mstart.sh uses VSTART_DEST to tell vstart.sh where to create the
cluster. in the cmake case, it needs to get a relative path from there
to the built binaries and libraries - update these paths to use the new
'lib' and 'bin' directories

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index cba84a8c26a8..c81a793245a2 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -12,8 +12,8 @@ if [ -n "$VSTART_DEST" ]; then
   CEPH_LIB=$SRC_PATH/.libs
 
   if [ -e CMakeCache.txt ]; then
-      CEPH_BIN=$VSTART_DEST/../../src
-      CEPH_LIB=$CEPH_BIN
+      CEPH_BIN=$VSTART_DEST/../../bin
+      CEPH_LIB=$VSTART_DEST/../../lib
   fi
 
   CEPH_CONF_PATH=$VSTART_DEST