r2006: debian

[clsql.git] / clsql.system

diff --git a/clsql.system b/clsql.system
index 52c55fd513f066f78a27d309a546e84c9e389dd7..059f20ff858396752576f63797ab1dcb607e18fc 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.3 2002/03/29 07:42:10 kevin Exp $
+;;;; $Id: clsql.system,v 1.11 2002/05/13 02:06:02 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,30 +19,32 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-(load (make-pathname :name "set-logical" :type "cl"
-                    :defaults *load-truename*))
-(set-logical-host-for-pathname "CLSQL" *load-truename*)
+;; 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)))
 
 ;;; System definitions
 
 (mk:defsystem :cmucl-compat
-    :source-pathname "CLSQL:cmucl-compat;"
+    :source-pathname "CL-LIBRARY:clsql;cmucl-compat;"
     :source-extension "cl"
-    :binary-pathname "CLSQL:cmucl-compat;bin;"
+    :binary-pathname "CL-LIBRARY:clsql;cmucl-compat;bin;"
     :components ((:file "cmucl-compat")
                 (:file "loop-extension")))
 
 (mk:defsystem :clsql
-    :source-pathname "CLSQL:sql;"
+    :source-pathname "CL-LIBRARY:clsql;sql;"
     :source-extension "cl"
-    :binary-pathname "CLSQL:sql;bin;"
-    :components ((:file "package")
-                (:file "conditions" :depends-on ("package"))
-                (:file "db-interface" :depends-on ("conditions"))
-                (:file "sql" :depends-on ("db-interface"))
-                (:file "utils" :depends-on ("package"))
-                (:file "functional" :depends-on ("sql")))
-    :depends-on (:cmucl-compat)
+    :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
+    :components ((:file "pool")
+                (:file "sql" :depends-on ("pool"))
+                (:file "transactions" :depends-on ("sql"))
+                (:file "utils")
+                (:file "functional" :depends-on ("sql"))
+                (:file "usql" :depends-on ("sql")))
+    :depends-on (:clsql-base)
     :finally-do
     (pushnew :clsql cl:*features*)
     )