Port make-dist to tar 1.27 and earlier

Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2018-03/msg00984.html
* make-dist: Use --sort=name only if Tar supports it.

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index bdf7b8ce04d4f92d44f54e2fa8e71e1b7c0a03c6..f9ad21709d3bf7561b0575ab605648b3ddacda0a 100644 (file)
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -210,7 +210,8 @@ longer present.
 
 Tar up the generated html_node/emacs/ and elisp/ directories and update
 the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz.
-Use GNU Tar as follows so that the tarballs are reproducible:
+Use GNU Tar 1.28 or later so that the tarballs are more reproducible,
+as follows:
 
   cd manual
   tar='tar --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name'

diff --git a/make-dist b/make-dist
index 48c7fb4fb7e6ce71349068332a2e3c99245a3516..d651e18b83ace2539222bb27a896c87a2257162e 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -643,7 +643,9 @@ if [ "${make_tar}" = yes ]; then
        *)  gzip_extension= ;;
   esac
   echo "Creating tar file"
-  taropt='--numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name'
+  taropt='--numeric-owner --owner=0 --group=0 --mode=go+u,go-w'
+  tar --sort=name -cf /dev/null $tempparent/$emacsname/src/lisp.h 2>/tmp/out &&
+    taropt="$taropt --sort=name"
   [ "$verbose" = "yes" ] && taropt="$taropt --verbose"
 
   (cd ${tempparent} ; tar $taropt -cf - ${emacsname} ) \