Automated merge with ssh://hg.cryhavoc.org.uk/dottes

makeWeb.sh

@@ -52,13 +52,14 @@ fi
 
 dir=`pwd`
 
+booke=$1
+masterbooke=$2
 bookedir=$dir/$1
+masterbookedir=$dir/$2
 webdir=$dir/web/$1
 graphicsdir=$dir/graphics/$1
 output=index.html
 tunelist=tunelist.html
-booke=$1
-masterbooke=$2
 title=$booke
 instrument=$3
 abc2xml=$dir/abc2xml/abc2xml.py
@@ -126,7 +127,7 @@ find $bookedir -name "*.abc" | sort |
         if [ -n "$credit" ]; then
             creditvisibility="yes"
         fi
-        lastchanged=`hg log --limit 1 --template "{date|shortdate}" $filename`
+        lastchanged=`hg log --limit 1 --template "{date|shortdate}" $masterbookedir/${name}.abc`
         key=`$dir/abcfield.py --field K $filename`
         fixkey $key
         key=$retval