vasabi: pass in whole bindir not bindir suffix for oot build

diff --git a/script/samba-build.sh b/script/samba-build.sh
index 9d66e94295be2e127f998077d0ac41b2898029e0..dfbf52b5cfb193576a7ce832947a8de8d65ad175 100755 (executable)
--- a/script/samba-build.sh
+++ b/script/samba-build.sh
@@ -16,7 +16,7 @@ SRC_DIR=${SRC_DIR:-"."}
 BLD_DIR=${BLD_DIR:-"${SRC_DIR}"}
 
 BIN_DIR_SUFFIX=${BIN_DIR_SUFFIX:-"$(uname -n)"}
-BIN_DIR="bin.${BIN_DIR_SUFFIX}"
+BIN_DIR=${BIN_DIR}:-"bin.${BIN_DIR_SUFFIX}"}
 
 SCRIPT_DIR=$(dirname $0)
 BUILDNICE=${BUILDNICE:-"${SCRIPT_DIR}/buildnice"}

diff --git a/script/vasabi.sh b/script/vasabi.sh
index 567821db4485b24e05f826583fca1682e0cc9355..582a541992c597793f3eb4e964caeafb32b21f9c 100755 (executable)
--- a/script/vasabi.sh
+++ b/script/vasabi.sh
@@ -36,7 +36,7 @@ vagrant --src-dir-host="${SRC_DIR_HOST}" \
        --provider=${PROVIDER}
 
 vagrant ssh ${TARGET} --command "cd ${SRC_DIR_GUEST} && \
-       BIN_DIR_SUFFIX=\"${TARGET}\" \
+       BIN_DIR=\"bin.${TARGET}\" \
        DO_REUSE_BINDIR=${DO_REUSE_BINDIR} \
        DO_COPY_BINDIR=${DO_COPY_BINDIR} \
        DO_BACKUP_FIRST=0 \