r2388: *** empty log message ***

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index d0a643fb8e03c1e3f2ee4cec52f49d5284fabc2c..c60ec628b0d2967c9d459134c76d5bac64c44994 100644 (file)
--- 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)
+  )