cmake: detection scripts use lowercase project name

Changing the detection scripts to use the new project name, changed in commit
c1a37101ea87a973068f2dc9858487f83ae57f88 (cmake: project name should be "ceph")

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>

diff --git a/src/ceph.in b/src/ceph.in
index cf1210d574b3eff03a62212149f2566301699f74..b404bca05cb240c0c4608314973777c8dcb9af3c 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -88,7 +88,7 @@ elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
      and os.path.exists(os.path.join(os.getcwd(), "bin/init-ceph")):
     src_path = None
     for l in open("./CMakeCache.txt").readlines():
-        if l.startswith("Ceph_SOURCE_DIR:STATIC="):
+        if l.startswith("ceph_SOURCE_DIR:STATIC="):
             src_path = l.split("=")[1].strip()
 
 

diff --git a/src/test/detect-build-env-vars.sh b/src/test/detect-build-env-vars.sh
index 83bcc869c0bbaeccb278ac008b3bc4b975935e9b..3f665c7be8a3c81e718c294b25d55dc860544cfc 100644 (file)
--- a/src/test/detect-build-env-vars.sh
+++ b/src/test/detect-build-env-vars.sh
@@ -5,7 +5,7 @@ if [ -n "$CEPH_BUILD_DIR" ] && [ -n "$CEPH_ROOT" ] && [ -n "$CEPH_BIN" ] && [ -n
 elif [ -e CMakeCache.txt ]; then
   echo "Environment Variables Not All Set, Detected Build System CMake"
   echo "Setting Environment Variables"
-  export CEPH_ROOT=`grep Ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2`
+  export CEPH_ROOT=`grep ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2`
   export CEPH_BUILD_DIR=`pwd`
   export CEPH_BIN=$CEPH_BUILD_DIR/bin
   export CEPH_LIB=$CEPH_BUILD_DIR/lib

diff --git a/src/vstart.sh b/src/vstart.sh
index a849184a5fe0648a32ccb1a89918c2e27e4e3c4b..e48f4e9e0c16288abae981af0f1b491138aa860c 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -24,7 +24,7 @@ fi
 # for running out of the CMake build directory
 if [ -e CMakeCache.txt ]; then
   # Out of tree build, learn source location from CMakeCache.txt
-  CEPH_ROOT=`grep Ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2`
+  CEPH_ROOT=`grep ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2`
   CEPH_BUILD_DIR=`pwd`
 fi