Merge branch 'PHP-8.1' into PHP-8.2

Author: ramsey

scripts/dev/makedist

@@ -5,6 +5,10 @@
 # Written by Stig Bakken <[email protected]> 1997-05-28.
 # Adapted to Git by Stanislav Malyshev <[email protected]>.
 
+# Check whether gtar is present (GNU tar)
+tar="$(which gtar)"
+tar="${tar:-$(which tar)}"
+
 # Go to project root directory.
 cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
 
@@ -124,7 +128,7 @@ fi
 
 # Export PHP.
 echo "makedist: Exporting $treeish from $git"
-git archive --format=tar $remote_option --prefix=$prefix/ $treeish | tar xvf - || exit 4
+git archive --format=tar $remote_option --prefix=$prefix/ $treeish | "$tar" xvf - || exit 4
 
 cd $prefix || exit 5
 
@@ -166,7 +170,7 @@ cd ..
 
 echo ""
 echo "makedist: Creating $prefix.tar archive."
-tar cf "$prefix".tar "$prefix"
+"$tar" cf "$prefix".tar "$prefix"
 rm -rf "$prefix" "$prefix".tar.*
 
 echo "makedist: Creating $prefix.tar.gz archive."