r9927: 27 Aug 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * db-mysql/Makefile, db-mysql/mysql-loader.lisp: accept patch
        from Jon Buffington for file locations on FreeBSD.

diff --git a/ChangeLog b/ChangeLog
index d4553cea2de53710d48aed6c36469e8b3a2f8beb..db819a502b0256e5b4b9039e0ef4b8a347e05477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+27 Aug 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * db-mysql/Makefile, db-mysql/mysql-loader.lisp: accept patch
+       from Jon Buffington for file locations on FreeBSD.
+       
 17 Aug 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * sql/db-interface.lisp: Improve messages when functions
        are passed a database object, but the method is not specialized
        for that database type.
+       * sql/metaclasses.lisp: Fix inline declaration (reported by
+       Cyrus Harmon)
        
 14 Aug 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * TODO: Add bug report about SQL generation with a table

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 7ec5dc105ab9d80127535806be887df007bac0c6..14721ce34bb43242754443b310c1948ffff95b96 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -26,7 +26,7 @@ shared_lib=$(base).so
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
-       CFLAGS="-I /usr/include/mysql -I /usr/local/include/mysql -I /sw/include/mysql" LDFLAGS="-L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+       CFLAGS="-I /usr/include/mysql -I /usr/local/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
        rm $(object)
 
 .PHONY: distclean

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index bd972f48d73f6909c174d20f9acbddc88234d058..db664e7ba667c96263f4bf0bdd8132458b79c9e8 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -33,7 +33,7 @@
     `(,(pathname-directory *load-pathname*)
       "/opt/mysql/lib/mysql/" "/usr/local/lib/"
       #+64bit "/usr/lib64/"
-      "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/"))
+      "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/"))
 
 (defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))