Module: sip-router Branch: master Commit: bc9dca0a9d05915a0f4634b7014b26958e81e21b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc9dca0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Dec 1 16:59:56 2012 -0500 db_mysql: fix cross-compilation --- modules/db_mysql/Makefile | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index 0700faf..d720f22 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -20,25 +20,19 @@ endif endif ifneq ($(MYSQLCFG),) - # use autodetection DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I.*\)\/mysql/\1/g' ) LIBS = $(shell $(MYSQLCFG) --libs) - else - # mysql.h locations (freebsd,openbsd solaris) - DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include \ + DEFS +=-I$(LOCALBASE)/include \ -I$(LOCALBASE)/include/mysql \ - -I$(LOCALBASE)/mysql/include \ - -I/usr/include/mysql - + -I$(LOCALBASE)/mysql/include # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD # (Debian does the right thing and puts it in /usr/lib) - LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ + LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ -L$(LOCALBASE)/mysql/lib/mysql/ \ -L$(LOCALBASE)/mysql/lib \ - -L/usr/lib64/mysql \ -lmysqlclient -lz endif