use the local do_build script

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index aa4e984bfabffe956f68aba47de073d289454dbf..8de8b7463b7891d710ef9e85ea167b8b94a48908 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -1,10 +1,11 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 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"
 
@@ -82,7 +83,7 @@ $no_build ||
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }
@@ -143,7 +144,7 @@ $no_build ||
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }