From 5af830209ba71ac3f13958a05224dd84d38f276f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 27 May 2025 13:49:13 +0100 Subject: tree.sh: simplify check_autoconf() Signed-off-by: Leah Rowe --- include/tree.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/tree.sh b/include/tree.sh index 54de692b..976e3b56 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -285,8 +285,8 @@ run_make_command() { [ -n "$mode" ] || x_ $premake - $dry check_cmake "$srcdir" && [ -z "$mode" ] && \ - $dry check_autoconf "$srcdir" + $dry check_cmake "$srcdir" + [ -n "$mode" ] || ( $dry check_autoconf "$srcdir" ) || err $dry check_makefile "$srcdir" || return 1 $dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs @@ -307,12 +307,10 @@ check_cmake() check_autoconf() { - ( x_ cd "$1" [ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs [ -f "autogen.sh" ] && x_ ./autogen.sh $autogenargs [ -f "configure" ] && x_ ./configure $autoconfargs; : - ) || err "can't bootstrap project: $1"; : } check_makefile() -- cgit v1.2.1