commit 1a90b6d604d0fad741c6c917df3e9aef6f878b62
Author: František Dvořák <valtri@civ.zcu.cz>
Date:   Sat Dec 7 17:05:36 2013 +0100

    Use -rpath link flag only for libraries. With libtool files deleted (building RPM packages), RPATH field is not present in binary files.

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 44443c0..0fadfd1 100644
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -49,11 +49,9 @@ CFLAGS:= \
 	-I${top_srcdir}/interface ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir}  ${LDFLAGS} 
-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir}
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} ${LDFLAGS}
+SOLINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
 ifeq (${thrflavour},)
@@ -92,10 +90,10 @@ version_info:=-version-info ${shell \
         perl -e '$$,=":"; @F=split /\./,"${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
 ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
-	${SOLINK} -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
+	${SOLINK} -module -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
 
 ${MACHINE_LIB}:  ${MACHINE_OBJS}
-	${LINK} ${version_info} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
+	${SOLINK} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
 #	ar crv $@ ${MACHINE_OBJS}
 #	-ranlib $@
 
commit 652b72448181348741d262261c94bea3f21a15c3
Author: František Dvořák <valtri@civ.zcu.cz>
Date:   Sat Dec 7 18:07:29 2013 +0100

    Return accidentally removed library version info.

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 0fadfd1..e3734c4 100644
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -93,7 +93,7 @@ ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
 	${SOLINK} -module -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
 
 ${MACHINE_LIB}:  ${MACHINE_OBJS}
-	${SOLINK} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
+	${SOLINK} ${version_info} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
 #	ar crv $@ ${MACHINE_OBJS}
 #	-ranlib $@