From 62bdbc395a23360ab63cefeaef954135640bee30 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 27 Aug 2020 03:33:44 +0100 Subject: [PATCH] bin/mdw-build: Prepare for a world where `mdw-setup' doesn't exist any more. I want `cfd' to go away as a thing which is installed centrally on systems. So stare at a package and try to figure out how one should go about setting it up. --- bin/mdw-build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/mdw-build b/bin/mdw-build index eff2c00..6c034b8 100755 --- a/bin/mdw-build +++ b/bin/mdw-build @@ -77,7 +77,7 @@ default_depends () { } : ${checkout=yes} ${checkoutrev=HEAD} : ${build=test} -: ${setup=yes} ${setupcmd=mdw-setup} +: ${setup=yes} ${setupcmd=!guess} : ${distcheck=yes} : ${debian=yes} : ${clean=yes} @@ -145,7 +145,7 @@ for opt; do checkout=*) checkout=yes checkoutrev=${opt#*=} ;; release) build=release ;; norelease) build=test ;; - setup) setup=yes setupcmd=mdw-setup ;; + setup) setup=yes setupcmd=!guess ;; setup=*) setup=yes setupcmd=${opt#*=} ;; upload) maybe_set upload uploadpath ;; upload=*) upload=yes uploadpath=${opt#*=} ;; @@ -366,6 +366,16 @@ esac ## Maybe refresh the build machinery. case "$setup" in yes) + case $setupcmd in + !guess) + if [ -f .links ]; then setupcmd=mdw-setup + elif [ -x autogen.sh ]; then setupcmd=./autogen.sh + elif [ -x setup ]; then setupcmd=./setup + elif [ -f configure.ac ]; then setupcmd="autoreconf -is" + else setupcmd=mdw-setup + fi + ;; + esac run $setupcmd ;; esac -- 2.11.0