Repl: Use paths rooted at both lib and src for ASDF.

mkhl · Sep 15, 2010 · ac5bd00 · ac5bd00
1 parent 449ad45
commit ac5bd00
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/repl/common.lisp b/repl/common.lisp
@@ -1,15 +1,11 @@
 ;;  -*- mode: lisp -*-
 
-(let* ((lisp-path (merge-pathnames #P"lib/lisp/" (user-homedir-pathname)))
-       (site-path (merge-pathnames #P"site/" lisp-path))
-       (asdf-path (merge-pathnames #P"systems/" lisp-path)))
-  #+asdf
-  (pushnew asdf-path asdf:*central-registry* :test #'equal)
-  #+asdf-install
-  (let* ((description "Local installation")
-         (location (list site-path asdf-path description)))
-    (pushnew location asdf-install:*locations* :test #'equal)
-    (setf asdf-install:*preferred-location* description)))
+#+asdf
+(let* ((home (user-homedir-pathname))
+       (lib-path (merge-pathnames #P"lib/lisp/systems/" home))
+       (src-path (merge-pathnames #P"src/lisp/systems/" home)))
+  (pushnew lib-path asdf:*central-registry* :test #'equal)
+  (pushnew src-path asdf:*central-registry* :test #'equal))
 
 (unless (fboundp 'asdf)
   (defun asdf (lib)