lib64 fix
authorAleš Křenek <ljocha@ics.muni.cz>
Thu, 19 Apr 2007 08:56:44 +0000 (08:56 +0000)
committerAleš Křenek <ljocha@ics.muni.cz>
Thu, 19 Apr 2007 08:56:44 +0000 (08:56 +0000)
org.glite.lb.proxy/Makefile
org.glite.lb.server/Makefile

index ecfbbc3..7335128 100644 (file)
@@ -63,11 +63,17 @@ GLOBUS_LIBS:= -L${globus_prefix}/lib \
        -lglobus_common_${nothrflavour} \
        -lglobus_gssapi_gsi_${nothrflavour} \
 
+archlib:=lib
+host_cpu:=${shell uname -m}
+ifeq (${host_cpu},x86_64)
+    archlib:=lib64
+endif
+
 ifneq (${mysql_prefix},/usr)
        ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
-               mysqlib := -L${mysql_prefix}/lib/mysql
+               mysqlib := -L${mysql_prefix}/${archlib}/mysql
        else
-               mysqlib := -L${mysql_prefix}/lib
+               mysqlib := -L${mysql_prefix}/${archlib}
        endif
 endif
 
index e514603..26dabcb 100644 (file)
@@ -129,11 +129,17 @@ GLOBUS_LIBS:= -L${globus_prefix}/lib \
 
 gsoap_bin_prefix:=${shell if [ -x  ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi }
 
+archlib:=lib
+host_cpu:=${shell uname -m}
+ifeq (${host_cpu},x86_64) 
+    archlib:=lib64
+endif
+
 ifneq (${mysql_prefix},/usr)
        ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
-               mysqlib := -L${mysql_prefix}/lib/mysql
+               mysqlib := -L${mysql_prefix}/${archlib}/mysql
        else
-               mysqlib := -L${mysql_prefix}/lib
+               mysqlib := -L${mysql_prefix}/${archlib}
        endif
 endif