From: Glenn Morris <rgm@gnu.org>
Date: Sun, 2 Apr 2017 20:14:45 +0000 (-0700)
Subject: Belated fixes for admin.el's M-x make-manuals-dist
X-Git-Tag: emacs-25.2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=849a0aaa1c9352a1bf06f4fa3369e8ed02c6b438;p=emacs.git

Belated fixes for admin.el's M-x make-manuals-dist

* admin/admin.el (make-manuals-dist-output-variables): Additions.
(make-manuals-dist--1): Also copy docstyle.texi.
---

diff --git a/admin/admin.el b/admin/admin.el
index 7b9f01f64a1..ca7f2dfbf72 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -657,7 +657,10 @@ style=\"text-align:left\">")
     ("@GZIP_PROG@" . "gzip")
     ("@INSTALL@" . "install -c")
     ("@INSTALL_DATA@" . "${INSTALL} -m 644")
-    ("@configure_input@" . ""))
+    ("@configure_input@" . "")
+    ("@AM_DEFAULT_VERBOSITY@" . "0")
+    ("@AM_V@" . "${V}")
+    ("@AM_DEFAULT_V@" . "${AM_DEFAULT_VERBOSITY}"))
   "Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
 
 (defun make-manuals-dist--1 (root type)
@@ -677,7 +680,9 @@ style=\"text-align:left\">")
 	(delete-directory stem t))
     (make-directory stem)
     (copy-file "../doc/misc/texinfo.tex" stem)
-    (or (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem))
+    (unless (equal type "emacs")
+      (copy-file "../doc/emacs/emacsver.texi" stem)
+      (copy-file "../doc/emacs/docstyle.texi" stem))
     (dolist (file (directory-files (format "../doc/%s" type) t))
       (if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
 	      (and (equal type "lispintro")