From: Aleš Křenek Date: Fri, 18 May 2007 08:11:55 +0000 (+0000) Subject: lib64 fix for mysql X-Git-Tag: glite-jp-index_R_1_3_0_1~2 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b62225ae1ececde72722946412de598d18fd7e3f;p=jra1mw.git lib64 fix for mysql --- diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile index a96c95d..87d77e2 100644 --- a/org.glite.jp.primary/Makefile +++ b/org.glite.jp.primary/Makefile @@ -90,11 +90,17 @@ GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${ TRIOLIB:=-lglite_jp_trio LIBTARLIB:=-L${libtar_prefix}/lib -ltar +archlib:=lib +host_cpu:=${shell uname -m} +ifeq (${host_cpu},x86_64) + archlib:=lib64 +endif + ifneq (${mysql_prefix},/usr) - ifeq ($(shell test -f ${mysql_prefix}/lib/libmysqlclient.a -o -f ${mysql_prefix}/lib/libmysqlclient.so && echo ok),ok) - MYSQLIB := -L${mysql_prefix}/lib -lmysqlclient -lz + ifeq ($(shell test -f ${mysql_prefix}/${archlib}/libmysqlclient.a -o -f ${mysql_prefix}/${archlib}/libmysqlclient.so && echo ok),ok) + MYSQLIB := -L${mysql_prefix}/${archlib} -lmysqlclient -lz else - MYSQLIB := -L${mysql_prefix}/lib/mysql -L${mysql_prefix}/lib -lmysqlclient -lz + MYSQLIB := -L${mysql_prefix}/${archlib}/mysql -L${mysql_prefix}/${archlib} -lmysqlclient -lz endif else MYSQLIB := -lmysqlclient diff --git a/org.glite.jp.server-common/Makefile b/org.glite.jp.server-common/Makefile index 9324da2..b120cb0 100644 --- a/org.glite.jp.server-common/Makefile +++ b/org.glite.jp.server-common/Makefile @@ -50,11 +50,17 @@ HDRS:=db.h OBJS:=${SRCS:.c=.o} LOBJS:=${OBJS:.o=.lo} +archlib:=lib +host_cpu:=${shell uname -m} +ifeq (${host_cpu},x86_64) + archlib:=lib64 +endif + ifneq (${mysql_prefix},/usr) - ifeq ($(shell test -f ${mysql_prefix}/lib/libmysqlclient.a -o -f ${mysql_prefix}/lib/libmysqlclient.so && echo ok),ok) - MYSQLIB := -L${mysql_prefix}/lib -lmysqlclient -lz + ifeq ($(shell test -f ${mysql_prefix}/${archlib}/libmysqlclient.a -o -f ${mysql_prefix}/${archlib}/libmysqlclient.so && echo ok),ok) + MYSQLIB := -L${mysql_prefix}/${archlib} -lmysqlclient -lz else - MYSQLIB := -L${mysql_prefix}/lib/mysql -lmysqlclient -lz + MYSQLIB := -L${mysql_prefix}/${archlib}/mysql -lmysqlclient -lz endif else MYSQLIB := -lmysqlclient -lz