From: Glenn Morris <rgm@gnu.org>
Date: Mon, 1 Mar 2021 02:07:04 +0000 (-0800)
Subject: Improve admin.el's Makefile in standalone manual tarfiles
X-Git-Tag: emacs-28.0.90~3485
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8bdaac34579fd270b5ba5403711e626fb03587d0;p=emacs.git

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.
---

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\">")
 
 (defconst make-manuals-dist-output-variables
   '(("@\\(top_\\)?srcdir@" . ".")	; top_srcdir is wrong, but not used
-    ("@abs_top_builddir@" . "../../")   ; only for in-tree builds
+    ("@abs_top_builddir@" . ".")        ; wrong but unused
+    ("^\\(EMACS *=\\).*" . "\\1 emacs")
     ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
     ("^\\(clean:.*\\)" . "\\1 infoclean")
     ("@MAKEINFO@" . "makeinfo")
@@ -715,7 +716,8 @@ style=\"text-align:left\">")
 		   (string-match-p "\\.\\(eps\\|pdf\\)\\'" file)))
 	  (copy-file file stem)))
     (with-temp-buffer
-      (let ((outvars make-manuals-dist-output-variables))
+      (let ((outvars make-manuals-dist-output-variables)
+            (case-fold-search nil))
 	(push `("@version@" . ,version) outvars)
 	(insert-file-contents (format "../doc/%s/Makefile.in" type))
 	(dolist (cons outvars)