Re: master 83a6224: make-dist: check exit statuses more carefully

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

On 04/11/2018 12:40 PM, Glenn Morris wrote:
> This breaks eg ./make-dist --no-update --tar --no-check.
> Ref eghttps://hydra.nixos.org/build/72642760

Thanks for mentioning that. I installed the attached, which should fix this.


[-- Attachment #2: 0001-make-dist-fix-bug-with-top-level-ChangeLog.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]

From acdcd58ed1b73384c6a77f26b1a5c6b070ea3eed Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 11 Apr 2018 17:03:43 -0700
Subject: [PATCH] make-dist: fix bug with top-level ChangeLog

Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2018-04/msg00307.html
* make-dist (top_level_ChangeLog): New var.  Use it to link
top-level ChangeLog only when desired.
---
 make-dist | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make-dist b/make-dist
index 7fd227862b..4f420a9748 100755
--- a/make-dist
+++ b/make-dist
@@ -358,12 +358,14 @@ tempdir=
 echo "Creating top directory: '${tempdir}'"
 mkdir ${tempdir} || exit
 
+top_level_ChangeLog=
 if [ "$changelog" = yes ]; then
   if test -r .git; then
     ## When making a release or pretest the ChangeLog should already
     ## have been created and edited as needed.  Don't ignore it.
     if test -r ChangeLog; then
       echo "Using existing top-level ChangeLog"
+      top_level_ChangeLog=ChangeLog
     else
       echo "Making top-level ChangeLog"
       make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \
@@ -383,9 +385,9 @@ top_level=
   INSTALL README BUGS
   ChangeLog.*[0-9] Makefile.in autogen.sh configure configure.ac
   config.bat make-dist .dir-locals.el
-  aclocal.m4 CONTRIBUTE ChangeLog
+  aclocal.m4 CONTRIBUTE
 '
-ln $top_level $tempdir || exit
+ln $top_level $top_level_ChangeLog $tempdir || exit
 
 echo "Creating subdirectories"
 for subdir in site-lisp \
-- 
2.14.3