diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-04-17 09:32:40 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-04-17 09:32:40 -0700 |
| commit | 0797897f34467272b150eba54aa3bbff19e92aa1 (patch) | |
| tree | de30b455898572def032c92a57955ebc36d2b496 /admin | |
| parent | 41d9004e1cf50aa18720b52c6228b06e35ca96f5 (diff) | |
| parent | a1c53d4294550380de76d6a6c4e29e9e8f6f9133 (diff) | |
| download | emacs-0797897f34467272b150eba54aa3bbff19e92aa1.tar.gz | |
Merge from origin/emacs-26
a1c53d4 (origin/emacs-26) * admin/admin.el (make-manuals-dist--1): Up...
d0f745f Document some compilation-mode faces
23ccba0 Mention the assignment form in "Copyright Assignment"
0f5568e Fix confusing wording in the user manual
70ec392 Fix the MSDOS build when running under CWSDPMI
7a608fc * lisp/progmodes/python.el: Be more careful about temp file r...
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/admin.el b/admin/admin.el index 650cf47b807..d411b97ebbc 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) |