(bdf-directory-list): Fix last change.

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 7ef0ad30d6b..bf9b69ddef5 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -36,11 +36,17 @@
 ;;;###autoload
 (defvar bdf-directory-list
   (if (eq system-type 'ms-dos)
-      (list (expand-file-name "../fonts/bdf" invocation-directory))
+      (list (expand-file-name "fonts/bdf" installation-directory))
     '("/usr/local/share/emacs/fonts/bdf"))
   "*List of directories to search for `BDF' font files.
 The default value is '("/usr/local/share/emacs/fonts/bdf").")
 
+;; MS-DOS users like to move the binary around after it's built, but
+;; the value above is computed at loadup time.
+(and (eq system-type 'ms-dos)
+     (setq bdf-directory-list
+           (list (expand-file-name "fonts/bdf" installation-directory))))
+
 (defun bdf-expand-file-name (bdfname)
   "Return an abosolute path name of a `BDF' font file BDFNAME.
 It searches directories listed in the variable `bdf-directory-list'