- favour GLITE_LOCATION

- install both perftests

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 5577918..b141272 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -188,6 +188,7 @@ install:
                ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${PREFIX}/bin; \
        fi
 ifdef LB_PERF
+       ${INSTALL} -m 755 ${top_srcdir}/src/perftest_ll.sh ${PREFIX}/sbin
        ${INSTALL} -m 755 ${top_srcdir}/src/perftest_il.sh ${PREFIX}/sbin
 endif
        ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-locallogger

diff --git a/org.glite.lb.logger/src/perftest_il.sh b/org.glite.lb.logger/src/perftest_il.sh
index 484f0c9..6121555 100644 (file)
--- a/org.glite.lb.logger/src/perftest_il.sh
+++ b/org.glite.lb.logger/src/perftest_il.sh
@@ -3,7 +3,12 @@
 numjobs=10
 
 # XXX - there must be better way to find stage
-STAGEDIR=/home/michal/shared/egee/jra1-head/stage
+if [ -z "${GLITE_LOCATION}" ]; then
+       STAGEDIR=/home/michal/shared/egee/jra1-head/stage
+else
+       STAGEDIR=${GLITE_LOCATION}
+fi
+
 . $STAGEDIR/sbin/perftest_common.sh
 
 DEBUG=${DEBUG:-0}