X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=8de8b7463b7891d710ef9e85ea167b8b94a48908;hb=4105f526175d8fd8726d8e56a2fcca7edb94d8c0;hp=aa4e984bfabffe956f68aba47de073d289454dbf;hpb=6f383e1e093d9b206b2c44eda51bde53c847c55a;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index aa4e984..8de8b74 100755
--- 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
 	}