From 9f899cc1e176e5a310af3e42edaf367ea4edaf31 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Nov 2012 11:51:44 +1100
Subject: [PATCH] use dirname of $0 instead of explicit ../tools

---
 do_merge          | 2 +-
 make_tree_file    | 2 +-
 merge_akpm        | 2 +-
 merge_old_version | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/do_merge b/do_merge
index 01959dd..63d90cc 100755
--- a/do_merge
+++ b/do_merge
@@ -141,7 +141,7 @@ for h in $heads; do
 	esac
 	[ -f "../merge-fixes/$tree" ] && {
 		for p in $(cat "../merge-fixes/$tree"); do
-			../tools/merge_fix -n "$p" || {
+			$(dirname $0)/merge_fix -n "$p" || {
 				bash -i || exit
 			}
 		done
diff --git a/make_tree_file b/make_tree_file
index 7d2c513..fd0e6b9 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -53,7 +53,7 @@ git diff-tree -p "$l.." >"../$p"
 gpg2 -u 41D5C07A -a -b "../$p"
 #echo "$l" > "../LATEST-IS-$n"
 
-../tools/make_abat_scripts "$d" "$l"
+$(dirname $0)/make_abat_scripts "$d" "$l"
 
 echo Pushing to korg ...
 git push korg
diff --git a/merge_akpm b/merge_akpm
index 2a50dcb..06489d4 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -100,7 +100,7 @@ execute git merge --no-ff akpm/master || {
 
 [ -f "../merge-fixes/akpm" ] && {
 	for p in $(cat "../merge-fixes/akpm"); do
-		../tools/merge_fix -n "$p" || {
+		$(dirname $0)/merge_fix -n "$p" || {
 			bash -i || exit
 		}
 	done
diff --git a/merge_old_version b/merge_old_version
index 41833ea..d0a52f5 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -59,7 +59,7 @@ execute git merge "refs/next/$ver/$tree" || {
 }
 [ -f "../merge-fixes/$tree" ] && {
 	for p in $(cat "../merge-fixes/$tree"); do
-		../tools/merge_fix -n "$p" || {
+		$(dirname $0)/merge_fix -n "$p" || {
 			bash -i || exit
 		}
 	done
-- 
2.39.2