X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-mysql.asd;h=12b8479dbec78c9c1a4efa647b78d6096596555a;hp=2247697282d36de124efd5710d2a0141850973a4;hb=da9282a5c0ce927c613f1706f1c51796c75e16e4;hpb=bf641c516d77330e150d0f1b07fd02dceaae3ef4

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 2247697..12b8479 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -23,8 +21,10 @@
   (unless (find-package 'uffi)
     (asdf:operate 'asdf:load-op 'uffi)))
 
-(defvar *library-file-dir* (append (pathname-directory *load-truename*)
-				   (list "db-mysql")))
+(defvar *library-file-dir*
+  (merge-pathnames "db-mysql/"
+                   (make-pathname :name nil :type nil
+                                  :defaults *load-truename*)))
 
 (defclass clsql-mysql-source-file (c-source-file)
   ())
@@ -42,13 +42,14 @@
 	      found
 	      (make-pathname :name (component-name c)
 			     :type library-file-type
-			     :directory *library-file-dir*)))))
+			     :defaults *library-file-dir*)))))
 
 (defmethod perform ((o load-op) (c clsql-mysql-source-file))
   t)
 
 (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
-  (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
+  (and (find-package '#:mysql)
+       (symbol-function (intern (symbol-name '#:mysql-get-client-info)
 				(find-package '#:mysql)))
        t))
 
@@ -58,9 +59,7 @@
     (unless (zerop (run-shell-command
 		    #-freebsd "cd ~A; make"
 		    #+freebsd "cd ~A; gmake"
-		    (namestring (make-pathname :name nil
-					       :type nil
-					       :directory *library-file-dir*))))
+		    (namestring *library-file-dir*)))
       (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file))
@@ -80,7 +79,7 @@
   :description "Common Lisp SQL MySQL Driver"
   :long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
 
-  :depends-on (uffi clsql clsql-uffi)
+  :depends-on (clsql clsql-uffi)
   :components
   ((:module :db-mysql
 	    :components