X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/bfdee8c36e31700e3c744c68489cc8de2c4e2c12..570c7b19d2ed2b4512cd5f0d07f0d1400e865a65:/bin/mdw-build diff --git a/bin/mdw-build b/bin/mdw-build index 24ae04a..62edc4d 100755 --- 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,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