bin/mdw-sbuild-server: Use correct option if not building arch-specific.

[profile] / bin / mdw-build

diff --git a/bin/mdw-build b/bin/mdw-build
index 01b737c..2bb7bb1 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -96,7 +96,7 @@ prog=${0##*/}
 
 usage () {
   cat <<EOF
-Usage: $prog [-vr] BUILDOPT
+Usage: $prog [-v] BUILDOPT
 
 Build options:
 
@@ -117,7 +117,7 @@ EOF
 
 ## Parse simple options.
 verbose=no
-while getopts "hvr" opt; do
+while getopts "hv" opt; do
   case "$opt" in
     h) usage; exit 0 ;;
     v) verbose=yes ;;
@@ -406,9 +406,19 @@ 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
+       ;;
+      yes,*)
+       if [ -d $toppath/dist-$build.pkgs ]; then
+         sbuildargs="-p$toppath/dist-$build.pkgs $sbuildargs"
+       fi
+       ;;
+    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