From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 25 Nov 2004 09:55:24 +0000 (+0000)
Subject: Avoid adding -L/usr/lib
X-Git-Tag: glite-lb-server_R_0_5_2~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=77988cd6fb48be7773e50c223cd31e7c161437a2;p=jra1mw.git

Avoid adding -L/usr/lib
---

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index d6ac55f..07c4e8f 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -82,8 +82,10 @@ GLOBUS_THRLIBS:=-L${globus_prefix}/lib \
 	-lglobus_common_${thrflavour} \
 	-lglobus_gssapi_gsi_${thrflavour}
 
-EXPAT_LIBS:=-L${expat_prefix}/lib \
-	-lexpat
+ifneq (${expat_prefix},/usr)
+	EXPAT_LIBS:=-L${expat_prefix}/lib
+endif
+EXPAT_LIBS := ${EXPAT_LIBS} -lexpat
 
 ARES_LIBS:=-L${ares_prefix}/lib \
 	-lares
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index ccbc4b4..95a574e 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -52,7 +52,12 @@ GLOBUS_LIBS:=-L${globus_prefix}/lib \
         -lglobus_gssapi_gsi_${nothrflavour} \
 
 GLITE_LIBS:=-L${glite_location}/lib
-EXPAT_LIBS:=-L${expat_prefix}/lib -lexpat
+
+ifneq (${expat_prefix},/usr)
+	EXPAT_LIBS:=-L${expat_prefix}/lib
+endif
+EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
+
 ARES_LIBS:=-L${ares_prefix}/lib -lares
 LDFLAGS:=-L${stagedir}/lib \
     ${COVERAGE_FLAGS}