X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-base.system;h=2b7443762d7fd16ebff9fadfc1c66844ef7d3e1b;hp=3278dd6cdb0518deac6a2668a8973f646c03427d;hb=9f6b242d508ed11519a1e48f360bc59842e39112;hpb=2d7872d141e94112a6abb22b142efe4bfedffd9a

diff --git a/clsql-base.system b/clsql-base.system
index 3278dd6..2b74437 100644
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.9 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.10 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,24 +19,35 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :make)
 
-;; 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")
 
 ;;; System definitions
 
 (defsystem :clsql-base
-    :source-pathname "cl-library:clsql-base;"
-    :source-extension "cl"
-     :components ((:file "cmucl-compat")
-		 (:file "package")
-		 (:file "utils" :depends-on ("package"))
-		 (:file "classes" :depends-on ("package"))
-		 (:file "conditions" :depends-on ("classes"))
-		 (:file "db-interface" :depends-on ("conditions"))
-		 (:file "initialize" :depends-on ("db-interface")))
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+  :source-pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "cmucl-compat")
+	       (:file "package")
+	       (:file "utils" :depends-on ("package"))
+	       (:file "classes" :depends-on ("package"))
+	       (:file "conditions" :depends-on ("classes"))
+	       (:file "db-interface" :depends-on ("conditions"))
+	       (:file "initialize" :depends-on ("db-interface")))
+  :finally-do
+  (pushnew :clsql-base cl:*features*)
+  )