[Emacs-diffs] emacs-26 a1c53d4: * admin/admin.el (make-manuals-dist--1):

[Glenn Morris]

branch: emacs-26
commit a1c53d4294550380de76d6a6c4e29e9e8f6f9133
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/admin.el (make-manuals-dist--1):
    Update for incompatible copy-file change re "directories".
---
 admin/admin.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/admin.el b/admin/admin.el
index 41b1854..c1f6174 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)