From 77988cd6fb48be7773e50c223cd31e7c161437a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Thu, 25 Nov 2004 09:55:24 +0000 Subject: [PATCH] Avoid adding -L/usr/lib --- org.glite.lb.client/Makefile | 6 ++++-- org.glite.lb.common/Makefile | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) 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} -- 1.8.2.3