From: Sage Weil <sage@newdream.net>
Date: Wed, 24 Mar 2021 19:55:39 +0000 (-0400)
Subject: cpatch: behave with ninja (instead of make)
X-Git-Tag: v17.1.0~2437^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bbecc780bef05bd54b5a822d3f14d44ae2b954d;p=ceph.git

cpatch: behave with ninja (instead of make)

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/script/cpatch b/src/script/cpatch
index 3372ef3a23f3..854ced1b86ee 100755
--- a/src/script/cpatch
+++ b/src/script/cpatch
@@ -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