X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.system;h=2101f3cde6cc842a372c552f31e7844187d92d3f;hb=6b94f9667781589b9989602981d81413509319a5;hp=41ba9f24991289e7664a766d405233af547a54e2;hpb=2359c743fa126e65514454a7996e025f139a8241;p=clsql.git

diff --git a/clsql.system b/clsql.system
index 41ba9f2..2101f3c 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.5 2002/04/01 05:27:55 kevin Exp $
+;;;; $Id: clsql.system,v 1.18 2002/08/01 03:06:26 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,34 +17,27 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(in-package :make)
 
-(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;"
+(defsystem :clsql
+    :source-pathname "cl-library:clsql;"
     :source-extension "cl"
-    :binary-pathname "CLSQL:cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-		 (:file "loop-extension")))
-
-(mk:defsystem :clsql
-    :source-pathname "CLSQL:sql;"
-    :source-extension "cl"
-    :binary-pathname "CLSQL:sql;bin;"
     :components ((:file "package")
-		 (:file "classes")
-		 (:file "conditions" :depends-on ("classes"))
-		 (:file "db-interface" :depends-on ("conditions"))
-		 (:file "sql" :depends-on ("db-interface"))
-		 (:file "utils" :depends-on ("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 (:cmucl-compat)
+    :depends-on (:clsql-base)
     :finally-do
     (pushnew :clsql cl:*features*)
     )