X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.system;h=f4825151510e6614e069de9d8c3151afbc1c53a9;hb=6dee351e6d20e21a11c78ec9971ec07845b0d03e;hp=976ca20fa61ae19126206572baf3c34ac66399a5;hpb=41718190385a3efe7ea5be04d059391ae3a86141;p=clsql.git

diff --git a/clsql.system b/clsql.system
index 976ca20..f482515 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.10 2002/05/13 00:57:42 kevin Exp $
+;;;; $Id: clsql.system,v 1.16 2002/07/05 17:05:45 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,26 +19,23 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-(load (make-pathname :name "set-cl-library" :type "cl"
-		     :defaults *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 "CL-LIBRARY:clsql;cmucl-compat;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-		 (:file "loop-extension")))
-
 (mk:defsystem :clsql
-    :source-pathname "CL-LIBRARY:clsql;sql;"
+    :source-pathname "cl-library:clsql;sql;"
     :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
-    :components ((:file "pool")
+    :binary-pathname "cl-library:clsql;sql;bin;"
+    :components ((:file "package")
+		 (:file "pool" :depends-on ("package"))
+		 (:file "loop-extension")
 		 (: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)