X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.system;h=ef655b8411afdd386f4c9b80b679bf7d000b956e;hp=aa1356e845630af6d5fffe26c89c71b098d3832d;hb=cbec78ec2d390fcf641108c1ca8d1589a0f22ed8;hpb=f8a2aab1c18bd495299ea3c542bc1b6daac52db2

diff --git a/clsql.system b/clsql.system
index aa1356e..ef655b8 100644
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.14 2002/05/15 17:19:42 kevin Exp $
+;;;; $Id: clsql.system,v 1.20 2002/09/06 10:56:13 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,27 +17,29 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(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
 
-(mk:defsystem :clsql
-    :source-pathname "CL-LIBRARY:clsql;sql;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
-    :components ((:file "pool")
-		 (: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*)
-    )
+(defsystem :clsql
+  :source-pathname #.(format nil "~A:clsql;"
+			     #+common-lisp-controller "cl-library"
+			     #-common-lisp-controller "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*)
+  )