Merge branch 'maint'

1 files changed, 6 insertions, 4 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 1eb3d3a7..7db8b4d7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -772,12 +772,14 @@ tidy_install() {
 
 	if [ "$(check_option strip)" = "y" ]; then
 		msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")"
-		for file in $(find {,usr/{,local/},opt/*/}{bin,lib,sbin} -type f 2>/dev/null || true); do
-			case "$(file -biz "$file")" in
+		local binary bindirs
+		bindirs="bin lib sbin usr/bin usr/lib usr/sbin usr/local/bin usr/local/lib usr/local/sbin opt/*/bin opt/*/lib opt/*/sbin"
+		find ${bindirs} -type f 2>/dev/null | while read binary ; do
+			case "$(file -biz "$binary")" in
 				*application/x-sharedlib*)  # Libraries
-					/usr/bin/strip --strip-debug "$file";;
+					/usr/bin/strip --strip-debug "$binary";;
 				*application/x-executable*) # Binaries
-					/usr/bin/strip "$file";;
+					/usr/bin/strip "$binary";;
 			esac
 		done
 	fi