r2036: Debian build

[clsql.git] / clsql.system

diff --git a/clsql.system b/clsql.system
index f8143c175eb2f150ea55e60b7d28cf654a92b2e1..9b3fa3437d17fe12b7e387358876634fb08ec2b4 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.12 2002/05/13 05:24:57 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,11 +19,11 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-(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
 
@@ -44,7 +44,7 @@
                 (:file "utils")
                 (:file "functional" :depends-on ("sql"))
                 (:file "usql" :depends-on ("sql")))
-    :depends-on (:clsql-base)
+    :depends-on (:clsql-base :cmucl-compat)
     :finally-do
     (pushnew :clsql cl:*features*)
     )