r2300: Autocommit for make-debian

[clsql.git] / set-cl-library.cl

diff --git a/set-cl-library.cl b/set-cl-library.cl
index fc9e6fc82785be2c0db306321a8a861e8573ba06..228080ce25db78b306174f51111d380f35a8abbf 100644 (file)
--- a/set-cl-library.cl
+++ b/set-cl-library.cl
@@ -18,28 +18,26 @@
 ;; This mirrors the expectation of Common Lisp Controller's pathnames
 
 (handler-case
-    (logical-pathname-translations "CL-LIBRARY")
+    (logical-pathname-translations "cl-library")
   (error ()
         (let* ((dir (pathname-directory *load-truename*))
                (parent-dir (subseq dir 0 (1- (length dir)))))
           (load (make-pathname :name "set-logical" :type "cl"
                                :defaults *load-truename*))
           (set-logical-host-for-pathname 
-           "CL-LIBRARY" 
+           "cl-library" 
            (make-pathname :host (pathname-host *load-truename*)
                           :device (pathname-device *load-truename*)
                           :directory parent-dir))))
   (:no-error (translation)
-            ;; Make sure that CL-LIBRARY points to this installation
+            ;; Make sure that cl-library points to this installation
             (let* ((dir (pathname-directory *load-truename*))
                    (base-dir (car (last dir)))
                    (logical-dir (translate-logical-pathname 
                                  (concatenate 'string
-                                              "CL-LIBRARY:" base-dir ";"))))
+                                              "cl-library:" base-dir ";"))))
               (unless (equalp dir (pathname-directory logical-dir))
-                (error 
-                 (format nil "~S does not equal ~S"
-                         dir (pathname-directory logical-dir)))))))
-                       
-
-            ))
+                (let ((*print-circle* nil))
+                  (error "cl-library:~A; directory ~S does not equal *load-truename*'s directory ~S"
+                         base-dir (cdr dir)
+                         (cdr (pathname-directory logical-dir))))))))