Avoid adding -L/usr/lib

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index d6ac55f..07c4e8f 100644 (file)
--- 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 (file)
--- 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}