From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 13 Nov 2009 12:05:31 +0000 (+0000)
Subject: Consider arch libdir when linking c-ares.
X-Git-Tag: glite-lbjp-common-trio_R_1_0_1_1~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ce08d23426dfe40147b818b65bb02977f07faf51;p=jra1mw.git

Consider arch libdir when linking c-ares.
---

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index c962f02..be70ad8 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -146,15 +146,20 @@ LCAS_LIBS:=-L${lcas_prefix}/${libdir} -llcas
 #	-lvomsc${vomsflavour} \
 
 ifneq (${classads_prefix},/usr)
-	classadslib := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib
+	CLASSADS_LIBS := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib
 endif
+CLASSADS_LIBS := ${CLASSADS_LIBS} -lclassad
 
-classadslib := ${classadslib} -lclassad
+ifneq (${cares_prefix},/usr)
+	CARES_LIBS := -L${cares_prefix}/${libdir} -L${cares_prefix}/lib
+endif
+CARES_LIBS := ${CARES_LIBS} -lcares
 
 EXT_LIBS:=  \
-	-lz -lcares\
+	-lz \
 	${GRIDSITE_LIBS} \
-	${classadslib} \
+	${CLASSADS_LIBS} \
+	${CARES_LIBS} \
 	${LCAS_LIBS} \
 	${VOMS_LIBS}