propogate NEXT_BUILD_HOST/DIR everywhere

[next-scripts] / merge_old_version

diff --git a/merge_old_version b/merge_old_version
index c273d03d01132ac6da87ee5653cdf06f8ff1ea93..9cabd8b1c6b294fd3cb0c0bced4cdf0fabee30b8 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -5,6 +5,8 @@ SHA1_FILE="../SHA1s"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
+[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
+[ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
 no_build=false
 [ "$1" = "-n" ] && {
@@ -30,6 +32,9 @@ rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
        shift
 }
 
+export NEXT_BUILD_HOST="$build_host"
+export NEXT_BUILD_DIR="$build_dir"
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE