canonicalise some file/dir names

introduce $top_dir

diff --git a/common.sh b/common.sh
index 5e27d5f90abeef67082e63590b3767317e71f193..9f18277ca57cc1b8d782514d27724bb851f1dfdd 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -6,11 +6,12 @@
 [ "$_next_common_included" ] && return 0
 _next_common_included=1
 
-bin_dir=$(dirname "$0")
+bin_dir=$(realpath $(dirname "$0"))
+top_dir=$(dirname "$bin_dir")
 
-[ "$LOG_FILE" ] || LOG_FILE="../merge.log"
-SHA1_FILE="../SHA1s"
-CTRL_FILE="../etc/control"
+[ "$LOG_FILE" ] || LOG_FILE="$top_dir/merge.log"
+SHA1_FILE="$top_dir/SHA1s"
+CTRL_FILE="$top_dir/etc/control"
 
 build_host="ash"
 build_dir="/home/sfr/next/next"