]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cpatch: behave with ninja (instead of make)
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 19:55:39 +0000 (15:55 -0400)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 19:55:39 +0000 (15:55 -0400)
Signed-off-by: Sage Weil <sage@newdream.net>
src/script/cpatch

index 3372ef3a23f32a9965056c867715ed1b2e640317..854ced1b86eece77c8764fc39c115f7de39919fd 100755 (executable)
@@ -4,7 +4,7 @@ SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 BUILDPATH=$(pwd)
 
-if [ ! -e Makefile ] || [ ! -e ../do_cmake.sh ]; then
+if [ ! -e Makefile ] && [ ! -e build.ninja ] || [ ! -e ../do_cmake.sh ]; then
     echo "must run from cmake build dir"
     exit 1
 fi