From fcc7688cc23c434fe8a12b04aa55ac2dc5ec3113 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 25 Mar 2010 14:21:59 +0000
Subject: [PATCH] Update build for SL5/64bit - search cppunit in $libdir now.

---
 org.glite.lb.client/Makefile        | 11 ++---------
 org.glite.lb.common/Makefile        |  2 +-
 org.glite.lb.logger/Makefile        |  2 +-
 org.glite.lb.server/Makefile        |  4 ++--
 org.glite.lb.utils/Makefile         |  2 +-
 org.glite.lbjp-common.trio/Makefile |  2 +-
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index a428c4c..9847276 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -105,17 +105,10 @@ CXXFLAGS:=${CFLAGS}
 
 EXT_LIB:=
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
-# TODO: merge - check the 64bit stuff
-#             - and what about the new JOBID lib?
-host_cpu:=${shell uname -m}
-ifeq (${libdir},lib)
-	LDFLAGS:=-L${stagedir}/lib ${COVERAGE_FLAGS}
-else
-	LDFLAGS:=-L${stagedir}/${libdir} -L${stagedir}/lib ${COVERAGE_FLAGS}
-endif
+LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS}
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index d6901e1..2343207 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -70,7 +70,7 @@ LDFLAGS:=-L${stagedir}/${libdir} -L${stagedir}/lib \
 EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${classadslib}
 EXT_THRLIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${classadslib}
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
 ifdef LB_PROF
diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 9623224..7c1539f 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -67,7 +67,7 @@ EXT_LIB:=-lglite_lbu_trio -lglite_lbu_log
 
 GLITE_GSS_LIB:=-lglite_security_gss
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
 LOGD_OBJS:= logd_proto.o logd.o
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index aa968ed..cd82975 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -106,7 +106,7 @@ ifdef LBS_DB_PROFILE
 	CFLAGS:=${CFLAGS} -DLBS_DB_PROFILE
 endif
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
@@ -127,7 +127,7 @@ XSLTPROC:=xsltproc --novalid
 gsoap_bin_prefix:=${shell if [ -x  ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi }
 
 ifneq (${expat_prefix},/usr)
-	expatlib := -L${expat_prefix}/lib
+	expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib
 endif
 
 vomsflavour := _${nothrflavour}
diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 36af59e..a8cd8c8 100644
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -46,7 +46,7 @@ LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
 ifneq (${expat_prefix},/usr)
-	expatlib := -L${expat_prefix}/lib
+	expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib
 endif
 
 EXT_LIBS:= \
diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index 49d2789..74e87b8 100644
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -29,7 +29,7 @@ LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
 REPORTS:=${top_srcdir}/reports
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit -ldl
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit -ldl
 TEST_INC:=-I${cppunit_prefix}/include
 
 
-- 
1.8.2.3