From 9f6b242d508ed11519a1e48f360bc59842e39112 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 23 Aug 2002 19:39:56 +0000
Subject: [PATCH] r2388: *** empty log message ***

---
 clsql-aodbc.asd                | 12 ++++-----
 clsql-aodbc.system             | 14 +++++------
 clsql-base.asd                 | 25 +++++++++++++------
 clsql-base.system              | 45 +++++++++++++++++++++-------------
 clsql-mysql.asd                | 16 ++++++------
 clsql-mysql.system             | 18 +++++++-------
 clsql-oracle.asd               | 25 ++++++++++---------
 clsql-oracle.system            | 18 +++++++-------
 clsql-postgresql-socket.asd    | 18 +++++++-------
 clsql-postgresql-socket.system | 18 +++++++-------
 clsql-postgresql.asd           | 18 +++++++-------
 clsql-postgresql.system        | 18 +++++++-------
 clsql-uffi.asd                 | 14 +++++------
 clsql-uffi.system              | 14 +++++------
 clsql.asd                      | 35 +++++++++++++-------------
 clsql.system                   | 36 +++++++++++++--------------
 set-cl-library.cl              | 43 --------------------------------
 17 files changed, 183 insertions(+), 204 deletions(-)
 delete mode 100644 set-cl-library.cl

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 7d00f5c..7e0952d 100644
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-aodbc.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,10 @@
 (in-package :asdf)
 
 (defsystem clsql-aodbc
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-aodbc;"
-    :components ((:file "aodbc-package")
-		 (:file "aodbc-sql" :depends-on ("aodbc-package")))
-    :depends-on (:clsql-base))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
+  :components ((:file "aodbc-package")
+	       (:file "aodbc-sql" :depends-on ("aodbc-package")))
+  :depends-on (:clsql-base))
 
     
diff --git a/clsql-aodbc.system b/clsql-aodbc.system
index 82eb765..00d8f98 100644
--- a/clsql-aodbc.system
+++ b/clsql-aodbc.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-aodbc.system,v 1.9 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-aodbc.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
 ;;;;
@@ -20,10 +20,10 @@
 (in-package :make)
 
 (defsystem :clsql-aodbc
-    :source-pathname "cl-library:clsql-aodbc;"
-    :source-extension "cl"
-    :components ((:file "aodbc-package")
-		 (:file "aodbc-sql" :depends-on ("aodbc-package")))
-    :depends-on (:clsql-base))
+  :source-pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "aodbc-package")
+	       (:file "aodbc-sql" :depends-on ("aodbc-package")))
+  :depends-on (:clsql-base))
+
 
-    
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"))
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*)
+  )
diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 99a527c..b8796dc 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-mysql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-mysql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,14 +23,14 @@
 ;;; System definition
 
 (defsystem clsql-mysql
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-mysql;"
-    :components ((:file "mysql-package")
-		 (:file "mysql-loader" :depends-on ("mysql-package"))
-		 (:file "mysql-api" :depends-on ("mysql-loader"))
-		 (:file "mysql-sql" :depends-on ("mysql-api"))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
+  :components ((:file "mysql-package")
+	       (:file "mysql-loader" :depends-on ("mysql-package"))
+	       (:file "mysql-api" :depends-on ("mysql-loader"))
+	       (:file "mysql-sql" :depends-on ("mysql-api"))
 		 (:file "mysql-usql" :depends-on ("mysql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
 
 
 
diff --git a/clsql-mysql.system b/clsql-mysql.system
index c52525b..fd2910e 100644
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-mysql.system,v 1.16 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-mysql.system,v 1.17 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,14 +23,14 @@
 ;;; System definition
 
 (defsystem :clsql-mysql
-    :source-pathname "cl-library:clsql-mysql;"
-    :source-extension "cl"
-    :components ((:file "mysql-package")
-		 (:file "mysql-loader" :depends-on ("mysql-package"))
-		 (:file "mysql-api" :depends-on ("mysql-loader"))
-		 (:file "mysql-sql" :depends-on ("mysql-api"))
-		 (:file "mysql-usql" :depends-on ("mysql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
+  :source-pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "mysql-package")
+	       (:file "mysql-loader" :depends-on ("mysql-package"))
+	       (:file "mysql-api" :depends-on ("mysql-loader"))
+	       (:file "mysql-sql" :depends-on ("mysql-api"))
+	       (:file "mysql-usql" :depends-on ("mysql-sql")))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
 
 
 
diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 63f48c8..2154b25 100644
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,24 +1,25 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 
 (in-package :asdf)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-oracle"
-    :components
-    ((:file "oracle-package")
-     (:file "oracle-loader" :depends-on ("oracle-package"))
-     (:file "alien-resources" :depends-on ("oracle-package"))
-     (:file "oracle-constants" :depends-on ("oracle-package"))
-     (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
-     (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
-     (:file "oracle-objects" :depends-on ("oracle-sql")))
-    :depends-on (:clsql-base))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
+  :pathname "cl-library:clsql-oracle"
+  :components
+  ((:file "oracle-package")
+   (:file "oracle-loader" :depends-on ("oracle-package"))
+   (:file "alien-resources" :depends-on ("oracle-package"))
+   (:file "oracle-constants" :depends-on ("oracle-package"))
+   (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
+   (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
+   (:file "oracle-objects" :depends-on ("oracle-sql")))
+  :depends-on (:clsql-base))
 
 
 
diff --git a/clsql-oracle.system b/clsql-oracle.system
index 3852965..78a9ce4 100644
--- a/clsql-oracle.system
+++ b/clsql-oracle.system
@@ -1,24 +1,24 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.system,v 1.3 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-oracle.system,v 1.4 2002/08/23 19:39:56 kevin Exp $
 
 (in-package :make)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-    :source-pathname "cl-library:clsql-oracle"
-    :source-extension "cl"
-    :components
-    ((:file "oracle-package")
-     (:file "oracle-loader" :depends-on ("oracle-package"))
-     (:file "alien-resources" :depends-on ("oracle-package"))
-     (:file "oracle-constants" :depends-on ("oracle-package"))
+  :source-pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components
+  ((:file "oracle-package")
+   (:file "oracle-loader" :depends-on ("oracle-package"))
+   (:file "alien-resources" :depends-on ("oracle-package"))
+   (:file "oracle-constants" :depends-on ("oracle-package"))
      (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
      (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
      (:file "oracle-objects" :depends-on ("oracle-sql")))
-    :depends-on (:clsql-base))
+  :depends-on (:clsql-base))
 
 
 
diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 060dd30..5e07926 100644
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,11 +22,11 @@
 ;;; System definition
 
 (defsystem clsql-postgresql-socket
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-postgresql-socket;"
-    :components ((:file "postgresql-socket-package")
-		 (:file "postgresql-socket-api"
-			:depends-on ("postgresql-socket-package"))
-		 (:file "postgresql-socket-sql"
-			:depends-on ("postgresql-socket-api")))
-    :depends-on (:clsql-base :uffi))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
+  :components ((:file "postgresql-socket-package")
+	       (:file "postgresql-socket-api"
+		      :depends-on ("postgresql-socket-package"))
+	       (:file "postgresql-socket-sql"
+		      :depends-on ("postgresql-socket-api")))
+  :depends-on (:clsql-base :uffi))
diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
index cd9e038..8c145f6 100644
--- a/clsql-postgresql-socket.system
+++ b/clsql-postgresql-socket.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.system,v 1.10 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.system,v 1.11 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,11 +22,11 @@
 ;;; System definition
 
 (defsystem :clsql-postgresql-socket
-    :source-pathname "cl-library:clsql-postgresql-socket;"
-    :source-extension "cl"
-    :components ((:file "postgresql-socket-package")
-		 (:file "postgresql-socket-api"
-			:depends-on ("postgresql-socket-package"))
-		 (:file "postgresql-socket-sql"
-			:depends-on ("postgresql-socket-api")))
-    :depends-on (:clsql-base :uffi))
+  :source-pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "postgresql-socket-package")
+	       (:file "postgresql-socket-api"
+		      :depends-on ("postgresql-socket-package"))
+	       (:file "postgresql-socket-sql"
+		      :depends-on ("postgresql-socket-api")))
+  :depends-on (:clsql-base :uffi))
diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index ae45873..2245d9c 100644
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql-postgresql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,12 +20,12 @@
 (in-package :asdf)
 
 (defsystem clsql-postgresql
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-postgresql;"
-    :components ((:file "postgresql-package")
-		 (:file "postgresql-loader" :depends-on ("postgresql-package"))
-		 (:file "postgresql-api" :depends-on ("postgresql-loader"))
-		 (:file "postgresql-sql" :depends-on ("postgresql-api"))
-		 (:file "postgresql-usql" :depends-on ("postgresql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
+  :components ((:file "postgresql-package")
+	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
+	       (:file "postgresql-api" :depends-on ("postgresql-loader"))
+	       (:file "postgresql-sql" :depends-on ("postgresql-api"))
+	       (:file "postgresql-usql" :depends-on ("postgresql-sql")))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
 
diff --git a/clsql-postgresql.system b/clsql-postgresql.system
index 940f8f0..cbf5629 100644
--- a/clsql-postgresql.system
+++ b/clsql-postgresql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql.system,v 1.10 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-postgresql.system,v 1.11 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,12 +20,12 @@
 (in-package :make)
 
 (defsystem :clsql-postgresql
-    :source-pathname "cl-library:clsql-postgresql;"
-    :source-extension "cl"
-    :components ((:file "postgresql-package")
-		 (:file "postgresql-loader" :depends-on ("postgresql-package"))
-		 (:file "postgresql-api" :depends-on ("postgresql-loader"))
-		 (:file "postgresql-sql" :depends-on ("postgresql-api"))
-		 (:file "postgresql-usql" :depends-on ("postgresql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
+  :source-pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "postgresql-package")
+	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
+	       (:file "postgresql-api" :depends-on ("postgresql-loader"))
+	       (:file "postgresql-sql" :depends-on ("postgresql-api"))
+	       (:file "postgresql-usql" :depends-on ("postgresql-sql")))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
 
diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 2c010e8..a836524 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.2 2002/08/18 04:39:59 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,10 +23,10 @@
 ;;; System definition
 
 (defsystem clsql-uffi
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql-uffi;"
-    :components ((:file "clsql-uffi-package")
-		 (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-		 (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
-    :depends-on (:uffi))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :components ((:file "clsql-uffi-package")
+	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+	       (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
+  :depends-on (:uffi))
 
diff --git a/clsql-uffi.system b/clsql-uffi.system
index 84015d7..874d044 100644
--- a/clsql-uffi.system
+++ b/clsql-uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-uffi.system,v 1.6 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql-uffi.system,v 1.7 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,10 +23,10 @@
 ;;; System definition
 
 (defsystem :clsql-uffi
-    :source-pathname "cl-library:clsql-uffi;"
-    :source-extension "cl"
-    :components ((:file "clsql-uffi-package")
-		 (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-		 (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
-    :depends-on (:uffi))
+  :source-pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "clsql-uffi-package")
+	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+	       (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
+  :depends-on (:uffi))
 
diff --git a/clsql.asd b/clsql.asd
index d0a643f..c60ec62 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.2 2002/08/18 04:04:34 kevin Exp $
+;;;; $Id: clsql.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,16 +17,15 @@
 ;;;; *************************************************************************
 
 (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"
-				      :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
 
 (in-package :asdf)
 
+#-clsql-base
+(let ((path (make-pathname :name "clsql-base" :type "system"
+				      :defaults *load-truename*)))
+  (when (probe-file path)
+    (load path)))
+
 ;;; System definitions
 
 (unless (ignore-errors (find-class 'clsql-cl-source-file))
@@ -35,16 +34,16 @@
     "cl"))
 
 (defsystem clsql
-    :default-component-class clsql-cl-source-file
-    :pathname "cl-library:clsql;"
-    :perform (load-op :after (op clsql)
-		      (pushnew :clsql cl:*features*))
-    :components ((:file "package")
-		 (:file "pool" :depends-on ("package"))
-		 (:file "loop-extension")
-		 (:file "sql" :depends-on ("pool"))
+  :default-component-class clsql-cl-source-file
+  :pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
+  :perform (load-op :after (op clsql)
+		    (pushnew :clsql cl:*features*))
+  :components ((:file "package")
+	       (:file "pool" :depends-on ("package"))
+	       (:file "loop-extension")
+	       (:file "sql" :depends-on ("pool"))
 		 (:file "transactions" :depends-on ("sql"))
 		 (:file "functional" :depends-on ("sql"))
 		 (:file "usql" :depends-on ("sql")))
-    :depends-on (:clsql-base)
-    )
+  :depends-on (:clsql-base)
+  )
diff --git a/clsql.system b/clsql.system
index 2101f3c..055927d 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.18 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: clsql.system,v 1.19 2002/08/23 19:39:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,25 +19,25 @@
 (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"
+#-clsql-base
+(let ((path (make-pathname :name "clsql-base" :type "system"
 				      :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
+  (when (probe-file path)
+    (load path)))
 
 ;;; System definitions
 
 (defsystem :clsql
-    :source-pathname "cl-library:clsql;"
-    :source-extension "cl"
-    :components ((:file "package")
-		 (:file "pool" :depends-on ("package"))
-		 (:file "loop-extension")
-		 (:file "sql" :depends-on ("pool"))
-		 (:file "transactions" :depends-on ("sql"))
-		 (:file "functional" :depends-on ("sql"))
-		 (:file "usql" :depends-on ("sql")))
-    :depends-on (:clsql-base)
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+  :source-pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "package")
+	       (:file "pool" :depends-on ("package"))
+	       (:file "loop-extension")
+	       (:file "sql" :depends-on ("pool"))
+	       (:file "transactions" :depends-on ("sql"))
+	       (:file "functional" :depends-on ("sql"))
+	       (:file "usql" :depends-on ("sql")))
+  :depends-on (:clsql-base)
+  :finally-do
+  (pushnew :clsql cl:*features*)
+  )
diff --git a/set-cl-library.cl b/set-cl-library.cl
deleted file mode 100644
index 228080c..0000000
--- a/set-cl-library.cl
+++ /dev/null
@@ -1,43 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          set-cl-library.cl
-;;;; Purpose:       Sets CL-LIBRARY logical host name if it does not exist
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  May 2002
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-;; Set logical pathname CL-LIBRARY to be directory above *load-truename*
-;; This mirrors the expectation of Common Lisp Controller's pathnames
-
-(handler-case
-    (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" 
-	    (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
-	     (let* ((dir (pathname-directory *load-truename*))
-		    (base-dir (car (last dir)))
-		    (logical-dir (translate-logical-pathname 
-				  (concatenate 'string
-					       "cl-library:" base-dir ";"))))
-	       (unless (equalp 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))))))))
-- 
2.34.1