Merge branch 'master' into 25.06_branch

1 files changed, 6 insertions, 4 deletions

diff --git a/include/tree.sh b/include/tree.sh
index 25d4732c..83887864 100644
--- a/include/tree.sh
+++ b/include/tree.sh
@@ -275,7 +275,8 @@ elfcheck()
 
 handle_makefile()
 {
-	$dry check_makefile "$srcdir" && x_ make -C "$srcdir" $cleanargs clean
+	$dry check_makefile "$srcdir" && \
+	    $dry x_ make -C "$srcdir" $cleanargs clean
 
 	[ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config"
 	[ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \
@@ -332,8 +333,9 @@ check_makefile()
 
 copy_elf()
 {
-	[ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do
-		[ -f "$srcdir/$f" ] && x_ cp "$srcdir/$f" "$dest_dir"
-	done < "$listfile"
+	[ -f "$listfile" ] && x_ mkdir -p "$dest_dir"
+	[ ! -f "$listfile" ] || while read -r f; do
+		[ -f "$srcdir/$f" ] && x_ cp "$srcdir/$f" "$dest_dir"; :
+	done < "$listfile" || err "copy_elf $*: cannot read '$listfile'"; :
 	x_ make clean -C "$srcdir" $cleanargs
 }