projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2192: Debian build
[clsql.git]
/
set-cl-library.cl
diff --git
a/set-cl-library.cl
b/set-cl-library.cl
index fc9e6fc82785be2c0db306321a8a861e8573ba06..689113c639f48031f600a3d50aff92b0af065cb0 100644
(file)
--- 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
;; 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)))))
(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)
: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
(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))
(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))))))))