From: Zdeněk Šustr Date: Fri, 26 Jun 2009 13:56:26 +0000 (+0000) Subject: Makefile relies on the libdir variable. X-Git-Tag: glite-lbjp-common-db_R_1_0_1_2~4 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8299c3035ee374d18a11ce5cfa65e47daa7a3df4;p=jra1mw.git Makefile relies on the libdir variable. --- diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile index 265a056..94eb1cf 100644 --- a/org.glite.lbjp-common.db/Makefile +++ b/org.glite.lbjp-common.db/Makefile @@ -26,13 +26,7 @@ VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples DEBUG:=-g -O0 -W -Wall -archlib:=lib -host_cpu:=${shell uname -m} -ifeq (${host_cpu},x86_64) - archlib:=lib64 -endif - -MYSQL_SONAME:=$(shell ../project/get_soname.sh ${mysql-devel_prefix}/${archlib} ${mysql_prefix}/${archlib} ${mysql-devel_prefix}/lib ${mysql_prefix}/lib) +MYSQL_SONAME:=$(shell ../project/get_soname.sh ${mysql-devel_prefix}/${libdir} ${mysql_prefix}/${libdir} ${mysql-devel_prefix}/lib ${mysql_prefix}/lib) MYSQL_CPPFLAGS:=-I${mysql-devel_prefix}/include -I${mysql-devel_prefix}/include/mysql -DMYSQL_SONAME=\"${MYSQL_SONAME}\" MYSQL_LIBS=-lz