diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-04-11 17:03:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-04-11 17:04:16 -0700 |
| commit | 6273503660e055dddbf081e94040d4b1b4735c93 (patch) | |
| tree | 488082c045135e0699c08a813825929f25dfe808 /make-dist | |
| parent | 57442b6812e9ec565efc39f722e84079dd71d8c0 (diff) | |
| download | emacs-6273503660e055dddbf081e94040d4b1b4735c93.tar.gz | |
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.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/make-dist b/make-dist index 7fd227862b6..4f420a97489 100755 --- a/make-dist +++ b/make-dist @@ -358,12 +358,14 @@ fi 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 \ |