r2569: Auto commit for Debian build

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 3d29edca90114eba89dc12540f5315e115d0928d..ac2fb352d32265010d3eed499711d404a7649317 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.1 2002/08/18 02:57:50 kevin Exp $
+;;;; $Id: clsql.asd,v 1.5 2002/09/06 10:26:17 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,34 +17,33 @@
 ;;;; *************************************************************************
 
 (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 (find-class 'clsql-cl-source-file)
-  (defclass clsql-cl-source-file (cl-source-file) ())
-  (defmethod source-file-type ((c clsql-cl-source-file) (s module)) 
-    "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"))
+  :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)
+  )
+
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql)))) 
+   "cl")
+