]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: fix up cmake paths when VSTART_DEST is given 8363/head
authorCasey Bodley <cbodley@redhat.com>
Tue, 29 Mar 2016 19:11:26 +0000 (15:11 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 29 Mar 2016 19:26:31 +0000 (15:26 -0400)
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>
src/vstart.sh

index cba84a8c26a8d44781f3c6d2cabe877921aa7b62..c81a793245a299ba8c395ad0c987261ef32ce487 100755 (executable)
@@ -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