From: Paul Eggert <eggert@cs.ucla.edu>
To: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
Subject: Re: master 83a6224: make-dist: check exit statuses more carefully
Date: Wed, 11 Apr 2018 17:07:00 -0700 [thread overview]
Message-ID: <56a99628-1de2-2ef3-a2e4-faef9c804fba@cs.ucla.edu> (raw)
In-Reply-To: <8vtvshy1jo.fsf@fencepost.gnu.org>
[-- 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
prev parent reply other threads:[~2018-04-12 0:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180409203519.16812.87351@vcs0.savannah.gnu.org>
[not found] ` <20180409203521.3506A20450@vcs0.savannah.gnu.org>
2018-04-10 9:04 ` master 83a6224: make-dist: check exit statuses more carefully Robert Pluim
2018-04-12 0:19 ` Paul Eggert
2018-04-12 8:07 ` Robert Pluim
2018-04-11 19:40 ` Glenn Morris
2018-04-12 0:07 ` Paul Eggert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56a99628-1de2-2ef3-a2e4-faef9c804fba@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.