From 2aad50cd59678366bb0bbc36afae3f07f94ade6b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 15 Sep 2026 19:51:55 +0100 Subject: [PATCH] even more tidy up run_make_command tidy it all the way up Signed-off-by: Leah Rowe --- mk | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/mk b/mk index 602c91c1..10905ab8 100755 --- a/mk +++ b/mk @@ -553,33 +553,30 @@ run_make_command() $if_build \ x_ $premake - $if_not_dry_build check_cmake "$srcdir" && \ - $if_build \ - $if_not_dry_build \ - check_autoconf "$srcdir" + ( + $if_dry_build \ + exit 0 - $if_not_dry_build check_makefile "$srcdir" || \ - return 1 - - $if_not_dry_build \ - x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs + x_ check_cmake "$srcdir" $if_build \ - x_ $mkhelper + check_autoconf "$srcdir" - check_makefile "$srcdir" || \ - return 0 + check_makefile "$srcdir" && \ + x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs - $if_make_clean \ - make -C "$srcdir" $cleanargs distclean || \ - x_ make -C "$srcdir" $cleanargs clean; : + ) || err "run_make_file" "$@" + + $if_build \ + x_ $mkhelper; : } check_cmake() { $if_dry_build \ return 0 - [ ! -n "$cmakedir" ] && \ + + [ -z "$cmakedir" ] && \ return 0 check_makefile "$1" || \