X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fmake-docfile.el;h=730a9419a54a38cc49d4cbf6c486cbe33a2bd2ed;hp=9157467d8931365f0ccb9aff5e2081a5dc686c55;hb=566b3d194e2d5c783808ac39437bd7e1a28b1c5c;hpb=72a705551741d6f85a40eea486c222bac482d8dc

diff --git a/lisp/make-docfile.el b/lisp/make-docfile.el
index 9157467..730a941 100644
--- 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,7 +75,8 @@
   (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)
 
@@ -85,13 +86,11 @@
 (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)))
@@ -171,7 +170,7 @@
 	   nil
 	   "-fc"
 	   (mapconcat
-	    'identity
+	    #'identity
 	    (append
 	     (list (concat default-directory "../lib-src/make-docfile"))
 	     options processed)