X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=set-cl-library.cl;h=689113c639f48031f600a3d50aff92b0af065cb0;hb=56c6eada9e6d05f092ba35ee00d5753f8f6d09f9;hp=fc9e6fc82785be2c0db306321a8a861e8573ba06;hpb=41718190385a3efe7ea5be04d059391ae3a86141;p=clsql.git

diff --git a/set-cl-library.cl b/set-cl-library.cl
index fc9e6fc..689113c 100644
--- a/set-cl-library.cl
+++ b/set-cl-library.cl
@@ -18,7 +18,7 @@
 ;; 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)))))
@@ -30,16 +30,14 @@
 			   :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))))))))