update.

[chise/xemacs-chise.git.1] / lisp / make-docfile.el

diff --git a/lisp/make-docfile.el b/lisp/make-docfile.el
index 1f56feb..730a941 100644 (file)
--- a/lisp/make-docfile.el
+++ b/lisp/make-docfile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1986, 1992-1995, 1997 Free Software Foundation, Inc.
 
 ;; Author: Unknown
-;; Maintainer: Steven L Baur <steve@altair.xemacs.org>
+;; Maintainer: Steven L Baur <steve@xemacs.org>
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -51,9 +51,9 @@
                 (string-equal arg "-a") ; Append to DOC file
                 (string-equal arg "-d")) ; Set working directory
             (if (string-equal arg "-o")
-                (setq docfile (car (cdr command-line-args))))
+                (setq docfile (expand-file-name (car (cdr command-line-args)))))
             (setq options (cons arg options))
-            (setq options (cons (car (cdr command-line-args)) options)))
+            (setq options (cons (expand-file-name (car (cdr command-line-args))) options)))
            ((string-equal arg "-i") ; Set site files to scan
             (setq site-file-list (car (cdr command-line-args))))
            (t (setq done t)))
@@ -75,25 +75,22 @@
   (setq command-line-args (cdr command-line-args)))
 
 ;; Then process the list of Lisp files.
-(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
+(let ((build-root (expand-file-name ".." invocation-directory)))
+  (setq load-path (list (expand-file-name "lisp" build-root))))
 
 (load "very-early-lisp" nil t)
 
 ;; Then process the autoloads
 (setq autoload-file-name "auto-autoloads.elc")
-(setq source-directory (concat default-directory "../lisp"))
-;; (print (concat "Source directory: " source-directory))
 (load "find-paths.el")
 (load "packages.el")
 (load "setup-paths.el")
 (load "dump-paths.el")
-
-(setq
- load-path
- (nconc load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH"))))
+(require 'custom)
+(load "process")
 
 (let (preloaded-file-list)
-  (load (concat default-directory "../lisp/dumped-lisp.el"))
+  (load (expand-file-name "../lisp/dumped-lisp.el"))
 
   (let ((package-preloaded-file-list
         (packages-collect-package-dumped-lisps late-package-load-path)))
@@ -173,7 +170,7 @@
           nil
           "-fc"
           (mapconcat
-           'identity
+           #'identity
            (append
             (list (concat default-directory "../lib-src/make-docfile"))
             options processed)