This commit was generated by cvs2svn to compensate for changes in r4995,
[chise/xemacs-chise.git.1] / lisp / setup-paths.el
index 4b365ef..3d07560 100644 (file)
 
 (defun paths-find-lock-directory (roots)
   "Find the lock directory."
-  (defvar configure-lock-directory)
   (paths-find-site-directory roots "lock" "EMACSLOCKDIR" configure-lock-directory))
 
 (defun paths-find-superlock-file (lock-directory)
   "Find the superlock file."
-  ;; #### There is no such variable configure-superlock-file!
   (cond
    ((null lock-directory)
     nil)
         (paths-decode-directory-path path-envval 'drop-empties)))
    (packages-find-package-exec-path early-packages)
    (packages-find-package-exec-path late-packages)
+   (packages-find-package-exec-path last-packages)
    (let ((emacspath-envval (getenv "EMACSPATH")))
      (and emacspath-envval
          (split-path emacspath-envval)))
    (and exec-directory
-       (list exec-directory))
-   (packages-find-package-exec-path last-packages)))
+       (list exec-directory))))
 
 (defun paths-find-data-directory (roots)
   "Find the data directory."
   (append
    (packages-find-package-data-path early-packages)
    (packages-find-package-data-path late-packages)
-   (list data-directory)
-   (packages-find-package-data-path last-packages)))
+   (packages-find-package-data-path last-packages)
+   (list data-directory)))
 
 ;;; setup-paths.el ends here