=== modified file 'functions/build-dir-from-image'
--- functions/build-dir-from-image	2017-12-06 18:55:58 +0000
+++ functions/build-dir-from-image	2017-12-01 18:19:29 +0000
@@ -5,7 +5,7 @@
 [[ -e $src ]] || die "Image not found: ${(qqq)src}"
 
 if ! (($+vars[build_dir])); then
-	vars[build_dir]=$DO:h/work/$OUT:t
+	vars[build_dir]=$DO:h/work/$BASE:t
 fi
 if ! (($+vars[fstab])); then
 	vars[fstab]=''

=== modified file 'functions/fresh-build-dir'
--- functions/fresh-build-dir	2017-12-06 18:55:58 +0000
+++ functions/fresh-build-dir	2017-12-01 16:44:57 +0000
@@ -1,5 +1,5 @@
 if ! (($+vars[build_dir])); then
-	vars[build_dir]=$DO:h/work/$OUT:t
+	vars[build_dir]=$DO:h/work/$BASE:t
 fi
 if ! (($+vars[fstab])); then
 	vars[fstab]=''

=== modified file 'functions/init-build-dir-vars'
--- functions/init-build-dir-vars	2017-12-06 18:55:58 +0000
+++ functions/init-build-dir-vars	2017-11-30 21:41:58 +0000
@@ -1,10 +1,10 @@
 if ! (($+vars[build_dir])); then
-	vars[build_dir]=$DO:h/work/$OUT:t
+	vars[build_dir]=$DO:h/work/$BASE:t
 fi
 if ! (($+vars[changes_dir])); then
-	vars[changes_dir]=$DO:h/work/$OUT:t.changes
+	vars[changes_dir]=$DO:h/work/$BASE:t.changes
 fi
 if ! (($+vars[work_dir])); then
-	vars[work_dir]=$DO:h/work/$OUT:t.work
+	vars[work_dir]=$DO:h/work/$BASE:t.work
 fi
 # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4