From: Glenn Morris <rgm@gnu.org>
Date: Tue, 16 Apr 2019 21:33:24 +0000 (-0700)
Subject: * admin/admin.el (make-manuals-dist--1):
X-Git-Tag: emacs-26.2.90~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1c53d4294550380de76d6a6c4e29e9e8f6f9133;p=emacs.git

* admin/admin.el (make-manuals-dist--1):
Update for incompatible copy-file change re "directories".
---

diff --git a/admin/admin.el b/admin/admin.el
index 41b1854c90d..c1f6174874b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -696,6 +696,7 @@ style=\"text-align:left\">")
     (if (file-directory-p stem)
 	(delete-directory stem t))
     (make-directory stem)
+    (setq stem (file-name-as-directory stem))
     (copy-file "../doc/misc/texinfo.tex" stem)
     (unless (equal type "emacs")
       (copy-file "../doc/emacs/emacsver.texi" stem)
@@ -718,7 +719,7 @@ style=\"text-align:left\">")
 	  (setq ats t)
 	  (message "Unexpanded: %s" (match-string 0)))
 	(if ats (error "Unexpanded configure variables in Makefile?")))
-      (write-region nil nil (expand-file-name (format "%s/Makefile" stem))
+      (write-region nil nil (expand-file-name (format "%sMakefile" stem))
 		    nil 'silent))
     (call-process "tar" nil nil nil "-cf" tarfile stem)
     (delete-directory stem t)