X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-mysql.asd;h=e8d89a871a6c9ddabd85fd490cd45976b05c7983;hp=0ac546d23b7616eef3080d2d1c4d517b67b0e7dd;hb=e261c2d65df050b7d1d03bc5cfa598c7585205ac;hpb=f3a8fc0bb7432ed7f9c9a1d2a5bc83e0b494aa6e

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 0ac546d..e8d89a8 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -23,8 +23,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)
   ())
@@ -37,12 +39,12 @@
 			    (probe-file (make-pathname :directory dir
 						       :name (component-name c)
 						       :type library-file-type)))
-			'((:absolute "usr" "lib" "clsql"))))) 
+			'((:absolute "usr" "lib" "clsql")))))
     (list (if found
 	      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)
@@ -50,17 +52,15 @@
 (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
   (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
 				(find-package '#:mysql)))
-       t)) 
+       t))
 
 (defmethod perform ((o compile-op) (c clsql-mysql-source-file))
   (unless (operation-done-p o c)
-    #-(or win32 mswindows)
+    #-(or win32 win64 windows mswindows)
     (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))
@@ -85,8 +85,8 @@
   ((:module :db-mysql
 	    :components
 	    ((:file "mysql-package")
-	     (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package"))
-	     (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
+	     (:clsql-mysql-source-file "clsql_mysql" :depends-on ("mysql-package"))
+	     (:file "mysql-loader" :depends-on ("mysql-package" "clsql_mysql"))
 	     (:file "mysql-client-info" :depends-on ("mysql-loader"))
 	     (:file "mysql-api" :depends-on ("mysql-client-info"))
 	     (:file "mysql-sql" :depends-on ("mysql-api"))