r2569: Auto commit for Debian build

[clsql.git] / clsql-base.asd

diff --git a/clsql-base.asd b/clsql-base.asd
index f17a1690a533636dde75b617861206b3823dd013..3642a207b53716c77f702c28da7fbaec3e6dbd77 100644 (file)
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.asd,v 1.3 2002/08/18 04:39:59 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.6 2002/09/06 10:26:17 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,24 +19,29 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
-;; For use with non-Debian installations
-(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+;; For use with non-Common Lisp Controller installations
+#-common-lisp-controller
+(let ((path (make-pathname :name "set-logical" :type "cl"
                                      :defaults *load-truename*)))
-  (when (probe-file helper-pathname)
-      (load helper-pathname)))
+  (when (probe-file path)
+    (load path)
+    (set-logical-host-for-pathname 
+     "clsql" 
+     (make-pathname :host (pathname-host *load-truename*)
+                   :device (pathname-device *load-truename*)
+                   :directory (pathname-directory *load-truename*)))))
 
-(unless (ignore-errors (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"))
+(defconstant +clsql-logical-host+
+  #+common-lisp-controller "cl-library"
+  #-common-lisp-controller "clsql"
+  "Logical hostname for loading system")
 
  ;;; System definitions
 
 (defsystem clsql-base
-  :default-component-class clsql-cl-source-file
-  :pathname "cl-library:clsql-base;"
+  :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
   :perform (load-op :after (op clsql-base)
-                   (pushnew :clsql cl:*features*))
+                   (pushnew :clsql-base cl:*features*))
   :components ((:file "cmucl-compat")
               (:file "package")
               (:file "utils" :depends-on ("package"))
@@ -45,3 +50,8 @@
               (:file "db-interface" :depends-on ("conditions"))
               (:file "initialize" :depends-on ("db-interface")))
   )
+
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-base)))) 
+   "cl")
+