candidate solution for #9701 -- use chrpath

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 208fbd7..3e2f8c8 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -80,7 +80,7 @@ LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS}
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
-LTSPLIT:=${top_srcdir}/project/libtool-paths-split.pl
+CHRPATH:=${chrpath}/bin/chrpath
 
 OBJS:=lb_plain_io.o escape.o events.o mini_http.o query_rec.o \
        status.o xml_conversions.o xml_parse.o ulm_parse.o param.o \
@@ -145,6 +145,7 @@ ${LTLIB}: ${OBJS}
                -lglite_wmsutils_cjobid \
                ${EXT_LIBS} \
                -lm
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${THRLTLIB}: ${THROBJS}
        ${LINK} ${version_info} -o $@ ${THRLOBJS} \
@@ -152,6 +153,7 @@ ${THRLTLIB}: ${THROBJS}
                -lglite_wmsutils_cjobid \
                ${EXT_LIBS} \
                -lm
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 stage: compile
        $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
@@ -196,7 +198,6 @@ install:
        mkdir -p ${PREFIX}/lib
        mkdir -p ${PREFIX}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${PREFIX}/lib
-       ${LTSPLIT} ${PREFIX}/lib/${LTLIB} ${PREFIX}/lib/${THRLTLIB}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        if [ x${DOSTAGE} = xyes ]; then \
                mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ; \

diff --git a/org.glite.lb.common/build.xml b/org.glite.lb.common/build.xml
index 638bc67..a53b076 100755 (executable)
--- a/org.glite.lb.common/build.xml
+++ b/org.glite.lb.common/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.8.6.1  2005/09/21 12:13:30  akrenek
+       the first attempt to fix #9701
+       
        Revision 1.8  2005/08/03 09:30:17  akrenek
        Merged the release 1.0 branch
        
@@ -117,12 +120,8 @@
                                <include name="at3" />
                                <include name="*.T" />
                                <include name="*.pm" />
-                               <include name="libtool-paths-split.pl" />
                        </fileset>
                </copy> 
-               <exec dir="${module.project.dir}" executable="chmod">
-                       <arg line="+x libtool-paths-split.pl"/>
-               </exec>
                <antcall target="lbmakefiles" />
        </target>
                

diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml
index 911dfcf..d543e06 100644 (file)
--- a/org.glite.lb.common/project/configure.properties.xml
+++ b/org.glite.lb.common/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.3  2004/08/31 07:57:17  akrenek
+       very first unit test
+       
        Revision 1.2  2004/07/06 20:50:10  flammer
        Moved to configure.properties.xml
        
@@ -52,6 +55,7 @@ ares_prefix=${with.ares.prefix}
 thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}
 cppunit=${with.cppunit.prefix}
+chrpath=${with.chrpath.prefix}
                        </echo>
            </target>
        </project>