From a1c53d4294550380de76d6a6c4e29e9e8f6f9133 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 16 Apr 2019 14:33:24 -0700 Subject: [PATCH] * 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 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) -- 2.39.2