Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 7 insertions, 2 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 5428e3a10bc..e81e7f1e7e1 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -655,7 +655,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)
@@ -675,7 +678,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")