From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 May 2016 18:17:25 +0000 (-0400)
Subject: * admin/admin.el (add-release-logs): Generate ChangeLog if needed.
X-Git-Tag: emacs-25.0.95~41^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c79e51;p=emacs.git

* admin/admin.el (add-release-logs): Generate ChangeLog if needed.
---

diff --git a/admin/admin.el b/admin/admin.el
index a3d56277918..33b0808f4fa 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -47,8 +47,9 @@ Optional argument DATE is the release date, default today."
   ;; your own personal one.  Perhaps we should move any existing file
   ;; and unconditionally call make ChangeLog?
   ;; Or make ChangeLog CHANGELOG=temp and compare with the existing?
-  (unless (file-exists-p (expand-file-name "ChangeLog" root))
-    (user-error "No top-level ChangeLog - run \"make ChangeLog\" first"))
+  (or (file-exists-p (expand-file-name "ChangeLog" root))
+      (zerop (call-process "make" nil nil nil "-C" root "ChangeLog"))
+      (error "Problem generating ChangeLog"))
   (require 'add-log)
   (or date (setq date (funcall add-log-time-format nil t)))
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))