summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-04-06 18:00:01 +0300
committerEli Zaretskii <eliz@gnu.org>2013-04-06 18:00:01 +0300
commitc31abc6232a88ea088fc930577332a33ada87dde (patch)
tree5ec2af7afdd9e0fd634af91c963d5edc5990d25b /lisp
parent2b57bbc04234519d208ce66bdaa04a5a1d1e4397 (diff)
downloademacs-c31abc6232a88ea088fc930577332a33ada87dde.tar.gz
emacs-c31abc6232a88ea088fc930577332a33ada87dde.tar.bz2
emacs-c31abc6232a88ea088fc930577332a33ada87dde.zip
Fix snafu with missing etc/DOC-X.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/loadup.el14
1 files changed, 12 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 00c52341058..e5406b6551f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -311,8 +311,18 @@
"-"
(substring name (match-end 0)))))
(if (memq system-type '(ms-dos windows-nt))
- (setq name (expand-file-name
- (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
+ (let ((name1 (expand-file-name
+ (if (fboundp 'x-create-frame) "DOC-X" "DOC")
+ "../etc")))
+ ;; There will be no DOC-X on MS-Windows when we build
+ ;; using the Posix Makefile's. In that case, we want
+ ;; to create DOC-XX.YY.ZZ, as on Unix.
+ (if (file-exists-p name)
+ (setq name name1)
+ (setq name (concat (expand-file-name "../etc/DOC-") name))
+ (if (file-exists-p name)
+ (delete-file name))
+ (copy-file (expand-file-name "../etc/DOC") name t)))
(setq name (concat (expand-file-name "../etc/DOC-") name))
(if (file-exists-p name)
(delete-file name))