From: Kevin M. Rosenberg Date: Fri, 27 Aug 2004 12:25:03 +0000 (+0000) Subject: r9927: 27 Aug 2004 Kevin Rosenberg X-Git-Tag: v3.8.6~251 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=fd28cb9d869ed8cd0778072b484dee556f4bd9d6;hp=48720858048d54c9ff6b79dbce56549d01e452d1 r9927: 27 Aug 2004 Kevin Rosenberg * 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 d4553ce..db819a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +27 Aug 2004 Kevin Rosenberg + * db-mysql/Makefile, db-mysql/mysql-loader.lisp: accept patch + from Jon Buffington for file locations on FreeBSD. + 17 Aug 2004 Kevin Rosenberg * 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 * TODO: Add bug report about SQL generation with a table diff --git a/db-mysql/Makefile b/db-mysql/Makefile index 7ec5dc1..14721ce 100644 --- 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 bd972f4..db664e7 100644 --- 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"))