--- pacman-g2-3.9.4/scripts/makepkg	2023-12-31 22:08:51.112385388 +0100
+++ pacman-g2-3.9.4.new/scripts/makepkg	2023-12-31 22:18:21.846617628 +0100
@@ -26,7 +26,7 @@
 #
 
 ## bash's 'echo' is buggy and does not check on write() for errors
-ECHO="/bin/echo"
+ECHO="/usr/bin/echo"
 startdir=`pwd`
 PKGDEST="$startdir"
 USE_COLOR="n"
@@ -365,14 +365,14 @@
 	# need that bc we may pull in dplicated flags from FB and/or Finclde
 	# just sanitize all FLAGS here
 
-	_LDFLAGS="$(/bin/echo ${_LDFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
+	_LDFLAGS="$(/usr/bin/echo ${_LDFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
 	_CFLAGS="${_MFLAGS} ${_OFLAG} ${_FLAGS} ${_LD_PLUGIN} -pipe"
 	_CXXFLAGS="${_MFLAGS} ${_OFLAG} ${_FLAGS} ${_LD_PLUGIN} -pipe"
 	LDFLAGS_=" ${_LDFLAGS} ${_CFLAGS} ${_CXXFLAGS}"
 
-	CFLAGS="$(/bin/echo ${_CFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
-	CXXFLAGS="$(/bin/echo ${_CXXFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
-	LDFLAGS="$(/bin/echo ${LDFLAGS_[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
+	CFLAGS="$(/usr/bin/echo ${_CFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
+	CXXFLAGS="$(/usr/bin/echo ${_CXXFLAGS[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
+	LDFLAGS="$(/usr/bin/echo ${LDFLAGS_[@]} | tr [:space:] '\n' | awk '!a[$0]++' | tr '\n' ' ')"
 
 	export LDFLAGS CFLAGS CXXFLAGS
 
@@ -1048,7 +1048,7 @@
 
 
 ## -t foo,bar -> foo
-MAKEPKG_TREE=$(/bin/echo $TREE | cut -d, -f1)
+MAKEPKG_TREE=$(/usr/bin/echo $TREE | cut -d, -f1)
 
 [[ -z ${MAKEFLAGS} ]] && export MAKEFLAGS="-j`getconf _NPROCESSORS_ONLN`"
 
@@ -2061,14 +2061,6 @@
 for dir in {pkg,pkg.*}
 do
 	[ ! -d ${dir} ] && continue
-	## invalid /security/ dir
-	if [ -d ${dir}/usr/lib/security ]; then
-		error "Your package installs PAM files in wrong PATH"
-		error "Files are installed in /usr/lib/security"
-		error "but should be /lib/security"
-		error "Bailing out, please fix your package!"
-		exit 1
-	fi
 	## invalid /libexec/ dirs
 	if [ -d ${dir}/usr/libexec ]; then
 		error "Your package has broken /libexec/ PATH"
@@ -2292,7 +2284,7 @@
 			if [ "$d" = "$startdir/pkg" ]; then
 				msg2 "Maybe broken link ${l#$d} in pkg $pkgname found."
 			else
-				if [[ "$(/bin/echo ${d##*/pkg.} | sed 's/.*-\(.*\)/\1/')" =~ "devel" ]]; then
+				if [[ "$(/usr/bin/echo ${d##*/pkg.} | sed 's/.*-\(.*\)/\1/')" =~ "devel" ]]; then
 					continue
 				else
 					msg2 "Maybe broken link ${l#$d} in pkg ${d##*/pkg.} found."
@@ -2302,7 +2294,7 @@
 			if [ "$d" = "$startdir/pkg" ]; then
 				msg2 "Broken link ${l#$d} in pkg $pkgname found."
 			else
-				if [[ "$(/bin/echo ${d##*/pkg.} | sed 's/.*-\(.*\)/\1/')" =~ "devel" ]]; then
+				if [[ "$(/usr/bin/echo ${d##*/pkg.} | sed 's/.*-\(.*\)/\1/')" =~ "devel" ]]; then
 					continue
 				else
 					msg2 "Broken link ${l#$d} in pkg ${d##*/pkg.} found."