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.
This commit is contained in:
Glenn Morris 2017-04-02 13:14:45 -07:00
parent 84938d7969
commit 849a0aaa1c

View file

@ -657,7 +657,10 @@ style=\"text-align:left\">")
("@GZIP_PROG@" . "gzip") ("@GZIP_PROG@" . "gzip")
("@INSTALL@" . "install -c") ("@INSTALL@" . "install -c")
("@INSTALL_DATA@" . "${INSTALL} -m 644") ("@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'.") "Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
(defun make-manuals-dist--1 (root type) (defun make-manuals-dist--1 (root type)
@ -677,7 +680,9 @@ style=\"text-align:left\">")
(delete-directory stem t)) (delete-directory stem t))
(make-directory stem) (make-directory stem)
(copy-file "../doc/misc/texinfo.tex" 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)) (dolist (file (directory-files (format "../doc/%s" type) t))
(if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file) (if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
(and (equal type "lispintro") (and (equal type "lispintro")