From b19b5643634a019430aa9ac8c65f2e418922b491 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 13 Apr 2015 16:08:36 +0200
Subject: [PATCH] vasabi: add DO_MAKE - control whether to run make

---
 script/samba-build.sh | 8 ++++++--
 script/vasabi.sh      | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/script/samba-build.sh b/script/samba-build.sh
index e34394b..9d66e94 100755
--- a/script/samba-build.sh
+++ b/script/samba-build.sh
@@ -10,6 +10,7 @@ THE_TESTS="${TESTS}"
 DO_CONFIGURE=${DO_CONFIGURE:-1}
 
 DO_MAKE_CLEAN=${DO_MAKE_CLEAN:-0}
+DO_MAKE=${DO_MAKE:-1}
 
 SRC_DIR=${SRC_DIR:-"."}
 BLD_DIR=${BLD_DIR:-"${SRC_DIR}"}
@@ -51,6 +52,7 @@ echo "DO_BACKUP_FIRST:   '${DO_BACKUP_FIRST}'"
 echo "DO_CONFIGURE:      '${DO_CONFIGURE}'"
 echo "CONFIGURE_OPTIONS: '${CONFIGURE_OPTIONS}'"
 echo "DO_MAKE_CLEAN:     '${DO_MAKE_CLEAN}'"
+echo "DO_MAKE:           '${DO_MAKE}'"
 echo "DO_TEST:           '${DO_TEST}'"
 echo "THE_TESTS:         '${THE_TESTS}'"
 echo "DO_REUSE_BINDIR:   '${DO_REUSE_BINDIR}'"
@@ -173,8 +175,10 @@ if [ $RC -eq 0 ]; then
 fi
 
 if [ $RC -eq 0 ]; then
-  ${BUILDNICE} $MAKE
-  RC=$?
+  if [ "${DO_MAKE}" != "0" ]; then
+    ${BUILDNICE} $MAKE
+    RC=$?
+  fi
 fi
 
 if [ "${DO_TEST}" != "0" ]; then
diff --git a/script/vasabi.sh b/script/vasabi.sh
index bda9044..567821d 100755
--- a/script/vasabi.sh
+++ b/script/vasabi.sh
@@ -43,6 +43,7 @@ vagrant ssh ${TARGET} --command "cd ${SRC_DIR_GUEST} && \
 	DO_TEST=${DO_TEST} \
 	TESTS=\"${TESTS}\" \
 	DO_CONFIGURE=${DO_CONFIGURE} \
+	DO_MAKE=${DO_MAKE} \
 	DO_MAKE_CLEAN=${DO_MAKE_CLEAN} \
 	CONFIGURE_OPTIONS=\"${CONFIGURE_OPTIONS}\" \
 	DO_OUT_OF_TREE=\"${DO_OUT_OF_TREE}\" \
-- 
2.34.1