bin/mdw-build: Refactor setting options to `mdw-sbuild'.

[profile] / bin / mdw-build

diff --git a/bin/mdw-build b/bin/mdw-build
index 24ae04a..de2ef72 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -241,7 +241,8 @@ while [ ! -f configure.ac -a ! -f configure.in -a \
   esac
   cd ..
 done
-assign srcpath $(pwd)
+assign toppath $(pwd)
+assign srcpath $toppath
 
 ## Build any necessary qualifiers.
 qual= sep=.
@@ -405,9 +406,14 @@ EOF
        mv debian/changelog.new debian/changelog
        ;;
     esac
+    sbuildargs=$sbuildsrv
+    case $sbuild,$build in
+      yes,release)
+       case $sign in yes) sbuildargs="-k$signkey $sbuildargs" ;; esac
+       ;;
+    esac
     case $sbuild,$build,$sign in
-      yes,release,yes) run mdw-sbuild -k$signkey $sbuildsrv ;;
-      yes,*) run mdw-sbuild $sbuildsrv ;;
+      yes,*) run mdw-sbuild $sbuildargs ;;
       no,release,yes) run dpkg-buildpackage -k$signkey ;;
       no,*) run dpkg-buildpackage -us -uc ;;
     esac