From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 26 Feb 2011 18:34:06 +0000 (+0000)
Subject: Fix build of client-java (trustmanager can be in stagedir).
X-Git-Tag: glite-lb-client-java_R_1_1_1_1~19
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4c3ede880d4d215e2c5e57e6bfc7458c72587d5d;p=jra1mw.git

Fix build of client-java (trustmanager can be in stagedir).
---

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index cb92f44..ef94cfe 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -15,8 +15,8 @@ JAVA:=${jdk_prefix}/bin/java
 
 GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 project/genEventTypes.pl
 AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
-axis_classpath:=$(shell ls ${axis_prefix}/lib/*.jar | tr '\012' :)
-trustmanager_classpath:=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${trustmanager_prefix}/share/java/trustmanager.jar:${trustmanager_prefix}/share/java/trustmanager-axis.jar
+axis_classpath:=$(shell ls -1 ${axis_prefix}/lib/*.jar 2>/dev/null | grep -v '\..*\.jar' | tr '\012' :)
+trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)
 
 all compile: genevents genws compile-java build-jar examples build-c