From 23336a3c7cfc21788c71ca395230a2a60d3d5ef9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 29 Mar 2016 15:11:26 -0400 Subject: [PATCH] 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 --- src/vstart.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.3