summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-04-16 14:33:24 -0700
committerGlenn Morris <rgm@gnu.org>2019-04-16 14:33:24 -0700
commita1c53d4294550380de76d6a6c4e29e9e8f6f9133 (patch)
tree4a5e831683dda10f865a40b33c40c84932835f60 /admin
parentd0f745f67ac36b4acc452deaa3a63d36c1c580a7 (diff)
downloademacs-a1c53d4294550380de76d6a6c4e29e9e8f6f9133.tar.gz
* admin/admin.el (make-manuals-dist--1):
Update for incompatible copy-file change re "directories".
Diffstat (limited to 'admin')
-rw-r--r--admin/admin.el3
1 files changed, 2 insertions, 1 deletions
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)