aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2021-02-28 18:07:04 -0800
committerGlenn Morris2021-02-28 18:07:04 -0800
commit8bdaac34579fd270b5ba5403711e626fb03587d0 (patch)
tree0d5d1926918089082c6332c8411b3cef255936d7 /admin
parent4825ea3c5d067accad1e714531799f1836b548b5 (diff)
downloademacs-8bdaac34579fd270b5ba5403711e626fb03587d0.tar.gz
emacs-8bdaac34579fd270b5ba5403711e626fb03587d0.zip
Improve admin.el's Makefile in standalone manual tarfiles
* admin/admin.el (make-manuals-dist-output-variables): Fix abs_top_builddir. Add EMACS. (make-manuals-dist--1): Respect case when replacing output variables.
Diffstat (limited to 'admin')
-rw-r--r--admin/admin.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 704c38d6f91..203cf10687e 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -665,7 +665,8 @@ style=\"text-align:left\">")
665 665
666(defconst make-manuals-dist-output-variables 666(defconst make-manuals-dist-output-variables
667 '(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used 667 '(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used
668 ("@abs_top_builddir@" . "../../") ; only for in-tree builds 668 ("@abs_top_builddir@" . ".") ; wrong but unused
669 ("^\\(EMACS *=\\).*" . "\\1 emacs")
669 ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .") 670 ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
670 ("^\\(clean:.*\\)" . "\\1 infoclean") 671 ("^\\(clean:.*\\)" . "\\1 infoclean")
671 ("@MAKEINFO@" . "makeinfo") 672 ("@MAKEINFO@" . "makeinfo")
@@ -715,7 +716,8 @@ style=\"text-align:left\">")
715 (string-match-p "\\.\\(eps\\|pdf\\)\\'" file))) 716 (string-match-p "\\.\\(eps\\|pdf\\)\\'" file)))
716 (copy-file file stem))) 717 (copy-file file stem)))
717 (with-temp-buffer 718 (with-temp-buffer
718 (let ((outvars make-manuals-dist-output-variables)) 719 (let ((outvars make-manuals-dist-output-variables)
720 (case-fold-search nil))
719 (push `("@version@" . ,version) outvars) 721 (push `("@version@" . ,version) outvars)
720 (insert-file-contents (format "../doc/%s/Makefile.in" type)) 722 (insert-file-contents (format "../doc/%s/Makefile.in" type))
721 (dolist (cons outvars) 723 (dolist (cons outvars)