From 84fc6abd90e59788f062b049b8415a5aff5dce8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 19 Sep 2006 20:57:04 +0000 Subject: [PATCH] - favour GLITE_LOCATION - install both perftests --- org.glite.lb.logger/Makefile | 1 + org.glite.lb.logger/src/perftest_il.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 5577918..b141272 100644 --- 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 --- 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} -- 1.8.2.3