* 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 41b1854c90d1155b1c39f96c43f65aaa554c79d3..c1f6174874be60379fcb4609c5d50b4dbffcad77 100644 (file)
--- 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)