From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 21 Mar 2016 12:46:52 +0000 (+0100)
Subject: cmake: fix mrun to handle cmake build structure
X-Git-Tag: v10.1.1~138^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8237%2Fhead;p=ceph.git

cmake: fix mrun to handle cmake build structure

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/mrun b/src/mrun
index 977eb24be7b3..df435ba9a1f5 100755
--- a/src/mrun
+++ b/src/mrun
@@ -5,7 +5,14 @@
 root=`dirname $0`
 run_name=$1
 command=$2
+CEPH_BIN=$root
+CEPH_CONF_PATH=$root/run/$run_name
+
+if [ -e CMakeCache.txt ]; then
+    CEPH_BIN=$PWD/src
+    CEPH_CONF_PATH=$PWD/run/$run_name
+fi
 
 shift 2
 
-$root/$command -c $root/run/$run_name/ceph.conf "$@"
+$CEPH_BIN/$command -c $CEPH_CONF_PATH/ceph.conf "$@"