Fix a build for _dev (if it would work :->). Will fix HEAD after merge.

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 7b2b5a7..ed8d5a0 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -31,7 +31,7 @@ CFLAGS=-I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        ${DEBUG}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib  ${LDFLAGS}
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
 GSOAP_FILES_PREFIX:= bk_ws_
@@ -39,7 +39,10 @@ dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
 ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
        langflavour:=_c
 endif
-GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
+ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+       langflavour:=_c
+endif
+GSOAP_LIB:=-L${stagedir}/${libdir} -L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o
 # ws_typeref.o
@@ -68,7 +71,7 @@ install:
        done
 
 clean:
-       rm -rf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo LoggingAndBookkeeping.nsmap soap_version.h ${CEXAMPLES}
+       rm -rf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES}