Contents in 1999-06-04-13 of release-21-2.

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

diff --git a/lisp/make-docfile.el b/lisp/make-docfile.el
index 1f56feb..e6c0cf8 100644 (file)
--- a/lisp/make-docfile.el
+++ b/lisp/make-docfile.el
@@ -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)))
@@ -81,8 +81,6 @@
 
 ;; 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")
@@ -93,7 +91,7 @@
  (nconc load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH"))))
 
 (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 +171,7 @@
           nil
           "-fc"
           (mapconcat
-           'identity
+           #'identity
            (append
             (list (concat default-directory "../lib-src/make-docfile"))
             options processed)