X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=29e2f38bf55d7835402837963faeee29ff297f29;hb=a96cc60ff60edef6b2373a73ed23c263e7c12ac8;hp=0d564b67fdf89de8ab01cad74831a7948531d084;hpb=b0d8b82d162436bf2a7406b4cea489084c232a85;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index 0d564b6..29e2f38 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -3,12 +3,10 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:     clsql.asd
-;;;; Purpose:  System definition for CLSQL-CLASSIC
+;;;; Purpose:  ASDF system definition for CLSQL
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
@@ -60,7 +58,7 @@ oriented interface."
                         ((:file "initialize")
 			 (:file "database" :depends-on ("initialize"))
 			 (:file "recording" :depends-on ("database"))
-			 (:file "pool"))
+			 (:file "pool" :depends-on ("database")))
                         :depends-on (base))
 	       (:module syntax
 			:pathname ""
@@ -99,11 +97,12 @@ oriented interface."
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (let* ((init-var (uffi:getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
-                        (merge-pathnames
-                         (make-pathname :name ".clsql-init" :type "lisp")
-                         (user-homedir-pathname))
+                        (probe-file
+                         (concatenate 'string
+                                      (namestring (user-homedir-pathname))
+                                      ".clsql-init.lisp"))
                         (probe-file "/etc/clsql-init.lisp")
-                        #+(or mswin windows win32)
+                        #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))