r2570: Auto commit for Debian build

[clsql.git] / clsql-base.system

diff --git a/clsql-base.system b/clsql-base.system
index 51b0c5845fd4cf29b64eb5c942f7ef8db75cdc36..c6b28b592a83bc03ce07947f85707c1d3bb549a5 100644 (file)
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.5 2002/05/15 17:10:28 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.11 2002/09/06 10:31:51 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,26 +17,38 @@
 ;;;; *************************************************************************
 
 (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"
+;; 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*)))))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defconstant +clsql-logical-host+
+      #+common-lisp-controller "cl-library"
+      #-common-lisp-controller "clsql"
+      "Logical hostname for loading system"))
 
 ;;; System definitions
 
-(mk:defsystem :clsql-base
-    :source-pathname "CL-LIBRARY:clsql;base;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;base;bin;"
-    :components ((:file "cmucl-compat")
-                (:file "package")
-                (:file "classes" :depends-on ("package"))
-                (:file "conditions" :depends-on ("classes"))
-                (:file "db-interface" :depends-on ("conditions"))
-                (:file "initialize" :depends-on ("db-interface")))
-    :finally-do
-    (pushnew :clsql cl:*features*)
-    )
+(defsystem :clsql-base
+  :source-pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
+  :source-extension "cl"
+  :components ((:file "cmucl-compat")
+              (:file "package")
+              (:file "utils" :depends-on ("package"))
+              (:file "classes" :depends-on ("package"))
+              (:file "conditions" :depends-on ("classes"))
+              (:file "db-interface" :depends-on ("conditions"))
+              (:file "initialize" :depends-on ("db-interface")))
+  :finally-do
+  (pushnew :clsql-base cl:*features*)
+  )