r2284: Autocommit for make-debian

[clsql.git] / clsql.system

diff --git a/clsql.system b/clsql.system
index f8143c175eb2f150ea55e60b7d28cf654a92b2e1..2101f3cde6cc842a372c552f31e7844187d92d3f 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.9 2002/05/13 00:45:10 kevin Exp $
+;;;; $Id: clsql.system,v 1.18 2002/08/01 03:06:26 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,31 +17,24 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(in-package :make)
 
-(handler-case
-    (logical-pathname-translations "CL-LIBRARY")
-  (error ()
-      (load (make-pathname :name "set-cl-library" :type "cl"
-                          :defaults *load-truename*))))
+;; 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)))
 
 ;;; System definitions
 
-(mk:defsystem :cmucl-compat
-    :source-pathname "CL-LIBRARY:clsql;cmucl-compat;"
+(defsystem :clsql
+    :source-pathname "cl-library:clsql;"
     :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;cmucl-compat;bin;"
-    :components ((:file "cmucl-compat")
-                (:file "loop-extension")))
-
-(mk:defsystem :clsql
-    :source-pathname "CL-LIBRARY:clsql;sql;"
-    :source-extension "cl"
-    :binary-pathname "CL-LIBRARY:clsql;sql;bin;"
-    :components ((:file "pool")
+    :components ((:file "package")
+                (:file "pool" :depends-on ("package"))
+                (:file "loop-extension")
                 (:file "sql" :depends-on ("pool"))
                 (:file "transactions" :depends-on ("sql"))
-                (:file "utils")
                 (:file "functional" :depends-on ("sql"))
                 (:file "usql" :depends-on ("sql")))
     :depends-on (:clsql-base)