From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 1 Dec 2010 19:52:24 +0000 (+0000)
Subject: Fix the gLite 3.2 build.
X-Git-Tag: merge_sec_lbu_src~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=18a91228dc5687a92dcc0660807a24a0e0ba1915;p=jra1mw.git

Fix the gLite 3.2 build.
gSoap external 2.7.6b installs itself to lib/ instead of lib64/.
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 33b3b6e..49dd394 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -95,7 +95,8 @@ ifeq (${lang},cxx)
 LINK_lang:=${LINKXX}
 endif
 
-GSOAP_LIBS?=-L${gsoap_prefix}/${libdir} -lgsoap
+gsoaplibdir=$(shell if test -d "${gsoap_prefix}/${libdir}"; then echo "${gsoap_prefix}/${libdir}"; else echo "${gsoap_prefix}/lib"; fi)
+GSOAP_LIBS?=-L${gsoaplibdir} -lgsoap
 
 EX_NOTHRLIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${nothrflavour}
 EX_THRLIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${thrflavour}