Fixed libmysql* searching (speed up the build with system's mysql).
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Tue, 14 Apr 2009 16:49:30 +0000 (16:49 +0000)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Tue, 14 Apr 2009 16:49:30 +0000 (16:49 +0000)
org.glite.lbjp-common.db/Makefile

index 32fc5ea..0a102a2 100644 (file)
@@ -32,7 +32,7 @@ ifeq (${host_cpu},x86_64)
        archlib:=lib64
 endif   
 
-MYSQL_SONAME:=$(shell lib=""; for dir in ${archlib} ${archlib}/mysql lib lib/mysql; do l=$(shell find ${mysql-devel_prefix}/$$dir -name libmysqlclient.so* | head -n 1); [ -f $$l ] && { lib=$$l; break;} ; done; if [ x != x$$lib ]; then readelf -d $$lib | grep SONAME | sed 's/.*\(libmysqlclient.so.[0-9]\{1,\}\).*/\1/'; else echo notfound; fi )
+MYSQL_SONAME:=$(shell -x lib=""; for dir in ${archlib} ${archlib}/mysql lib lib/mysql; do l=$(shell find ${mysql-devel_prefix}/$$dir -maxdepth 1 -name libmysqlclient.so* | head -n 1); [ -f $$l ] && { lib=$$l; break;} ; done; if [ x != x$$lib ]; then readelf -d $$lib | grep SONAME | sed 's/.*\(libmysqlclient.so.[0-9]\{1,\}\).*/\1/'; else echo notfound; fi )
 
 MYSQL_CPPFLAGS:=-I${mysql-devel_prefix}/include -I${mysql-devel_prefix}/include/mysql -DMYSQL_SONAME=\"${MYSQL_SONAME}\"
 MYSQL_LIBS=-lz