From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Tue, 16 Oct 2007 18:01:42 +0000 (+0000)
Subject: merged from branch_RC31_3
X-Git-Tag: org-gridsite-core_R_1_5_3~27
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=297498dbf1ae8947497c2d291a57b50ea2c0428b;p=jra1mw.git

merged from branch_RC31_3
---

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 0f68381..eecefe6 100644
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -93,6 +93,7 @@ install:
 		${INSTALL} -m 755 "$$p" "${PREFIX}/bin/glite-lb-$$p"; \
 	done
 
+# TODO: merge - not sure if this is really the current solution for lbplugin
 	-if [ x${DOSTAGE} != xyes ]; then \
 		${INSTALL} -m 755 ${stagedir}/lib/glite_lb_plugin.so ${PREFIX}/lib; \
 	fi
diff --git a/org.glite.lb.utils/project/version.properties b/org.glite.lb.utils/project/version.properties
index 03f8ff0..9848732 100755
--- a/org.glite.lb.utils/project/version.properties
+++ b/org.glite.lb.utils/project/version.properties
@@ -1,2 +1,3 @@
-module.version = 1.1.1
-module.age = 3
+# $Header$
+module.version=1.1.1
+module.age=5