X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-base.asd;h=cae66ee4bd21b16035c59f508d305ceaf966411c;hp=f17a1690a533636dde75b617861206b3823dd013;hb=9f6b242d508ed11519a1e48f360bc59842e39112;hpb=2d7872d141e94112a6abb22b142efe4bfedffd9a diff --git a/clsql-base.asd b/clsql-base.asd index f17a169..cae66ee 100644 --- a/clsql-base.asd +++ b/clsql-base.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql-base.asd,v 1.3 2002/08/18 04:39:59 kevin Exp $ +;;;; $Id: clsql-base.asd,v 1.4 2002/08/23 19:39:56 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -19,11 +19,22 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :asdf) -;; For use with non-Debian installations -(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl" +;; For use with non-Common Lisp Controller installations +#-common-lisp-controller +(let ((path (make-pathname :name "set-logical" :type "cl" :defaults *load-truename*))) - (when (probe-file helper-pathname) - (load helper-pathname))) + (when (probe-file path) + (load path) + (set-logical-host-for-pathname + "clsql" + (make-pathname :host (pathname-host *load-truename*) + :device (pathname-device *load-truename*) + :directory (pathname-directory *load-truename*))))) + +(defconstant +clsql-logical-host+ + #+common-lisp-controller "cl-library" + #-common-lisp-controller "clsql" + "Logical hostname for loading system") (unless (ignore-errors (find-class 'clsql-cl-source-file)) (defclass clsql-cl-source-file (cl-source-file) ()) @@ -34,9 +45,9 @@ (defsystem clsql-base :default-component-class clsql-cl-source-file - :pathname "cl-library:clsql-base;" + :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+) :perform (load-op :after (op clsql-base) - (pushnew :clsql cl:*features*)) + (pushnew :clsql-base cl:*features*)) :components ((:file "cmucl-compat") (:file "package") (:file "utils" :depends-on ("package"))