=== modified file 'common.zsh'
--- common.zsh	2017-12-06 19:34:01 +0000
+++ common.zsh	2017-12-06 19:28:19 +0000
@@ -2,12 +2,11 @@
 setopt no_unset warn_create_global extended_glob
 (($+xtrace)) && (($xtrace)) && set -x
 
-typeset -g FILE BASE OUT FUNCDIR TARGET
+typeset -g FILE BASE OUT FUNCDIR
 FILE=$1
 BASE=$2
 OUT=$3
 FUNCDIR=${0:h:a}/functions
-TARGET=$BASE:t.${${${DO:t}%.do}#default.}
 
 # helper that prints out error message and exits
 die() {

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

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

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