Merge from branch_3795.

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index cdeeda2..7813f71 100644 (file)
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -34,7 +34,7 @@ LIBLOBJS:=${LIBOBJS:.o=.lo}
 
 LIB:=libglite_jobid.la
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit -ldl
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit -ldl
 TEST_INC:=-I${cppunit_prefix}/include
 
 compile all: ${LIB}
@@ -44,7 +44,7 @@ version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split /\./,"${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
 ${LIB}: ${LIBOBJS}
-       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/lib 
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir}
 
 check: compile base64_test
        ./base64_test base64_test.xml
@@ -58,9 +58,9 @@ clean:
        rm -rvf log.xml project rpmbuild RPMS tgz
 
 install: ${LIB}
-       mkdir -p ${PREFIX}/lib
+       mkdir -p ${PREFIX}/${libdir}
        mkdir -p ${PREFIX}/include/${globalprefix}/${jobidprefix}
-       ${INSTALL} -m 644 ${LIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LIB} ${PREFIX}/${libdir}
        (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jobidprefix})
 
 

diff --git a/org.glite.jobid.api-c/project/ChangeLog b/org.glite.jobid.api-c/project/ChangeLog
index 008dac5..fdc70ac 100644 (file)
--- a/org.glite.jobid.api-c/project/ChangeLog
+++ b/org.glite.jobid.api-c/project/ChangeLog
@@ -7,6 +7,9 @@
 1.0.0-4
 - configure script update
 
+1.0.0-5
+- install libraries into $libdir
+
 1.0.1-1
 - additional includes in base64_test to fix build on Deb5
 

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 236c486..bc99bff 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -176,20 +176,20 @@ generate: ${GEN_HDRS}
 default: all
 
 ${LIB}: ${LIBOBJS}
-       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/lib \
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} \
                        ${COMMON_LIB} ${TRIO_LIB} \
                        -lglite_security_gss_${nothrflavour}
 
 ${THRLIB}: ${LIBTHROBJS}
-       ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}/lib \
+       ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}/${libdir} \
                        ${COMMON_LIB_THR} ${TRIO_LIB} \
                        -lglite_security_gss_${thrflavour}
 
 ${PLUSLIB}: ${PLUSOBJS} ${LIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/lib ${LIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
 
 ${THRPLUSLIB}: ${PLUSTHROBJS} ${THRLIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}/lib ${THRLIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB}
 
 logevent: logevent.o args.o
        ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} 
@@ -308,7 +308,7 @@ install:
        mkdir -p ${PREFIX}/bin
        mkdir -p ${PREFIX}/sbin
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix}
-       mkdir -p ${PREFIX}/lib
+       mkdir -p ${PREFIX}/${libdir}
        mkdir -p ${PREFIX}/share/doc/${package}-${version}/api
        mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples
        mkdir -p ${PREFIX}/share/man/man1
@@ -316,10 +316,10 @@ install:
        mkdir -p ${PREFIX}/share/man/man8
        mkdir -p ${PREFIX}/share/build/m4
 ifdef LB_STANDALONE
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/${libdir}
 else
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/lib
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/${libdir}
 endif
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} )
@@ -349,7 +349,8 @@ endif
        ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${PREFIX}/examples/glite-lb-notify.pl
        ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1
        ${INSTALL} -m 644 ${MAN8_GZ} ${PREFIX}/share/man/man8
-       ${INSTALL} -m 644 ${top_srcdir}/m4/*.m4 ${PREFIX}/share/build/m4/
+       sed "s/%LIBDIR%/${libdir}/" ${top_srcdir}/m4/glite_lb_client.m4 > glite_lb_client.m4
+       ${INSTALL} -m 644 glite_lb_client.m4 ${PREFIX}/share/build/m4/
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/

diff --git a/org.glite.lb.client/m4/glite_lb_client.m4 b/org.glite.lb.client/m4/glite_lb_client.m4
index 878d59f..f04dca8 100755 (executable)
--- a/org.glite.lb.client/m4/glite_lb_client.m4
+++ b/org.glite.lb.client/m4/glite_lb_client.m4
@@ -19,15 +19,15 @@ AC_DEFUN([AC_GLITE_LB],
        dnl
        dnl 
        dnl
-        ac_glite_lb_lib="-L$ac_glite_lb_prefix/lib"
+        ac_glite_lb_lib="-L$ac_glite_lb_prefix/%LIBDIR%"
        GLITE_LB_THR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_THR_FLAVOR"
        GLITE_LB_THR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_THR_FLAVOR"
        GLITE_LB_THR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_THR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_THR_LIBS"
        GLITE_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_NOTHR_FLAVOR"
        GLITE_LB_NOTHR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR"
         GLITE_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_NOTHR_LIBS"
-       GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_prefix/lib/libglite_lb_client_$GLOBUS_NOTHR_FLAVOR.a"
-        GLITE_STATIC_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_prefix/lib/libglite_lb_common_$GLOBUS_NOTHR_FLAVOR.a $SEC_GSOAP_PLUGIN_GSS_STATIC_NOTHR_LIBS"
+       GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_client_$GLOBUS_NOTHR_FLAVOR.a"
+        GLITE_STATIC_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_common_$GLOBUS_NOTHR_FLAVOR.a $SEC_GSOAP_PLUGIN_GSS_STATIC_NOTHR_LIBS"
        ifelse([$2], , :, [$2])
     else
        GLITE_LB_THR_CLIENT_LIBS=""

diff --git a/org.glite.lb.client/project/ChangeLog b/org.glite.lb.client/project/ChangeLog
index b7545e4..f08813f 100644 (file)
--- a/org.glite.lb.client/project/ChangeLog
+++ b/org.glite.lb.client/project/ChangeLog
@@ -58,3 +58,5 @@
 - Minor fixes in example builds
 - stats extended for any job state
 
+4.0.3-2
+- install libraries into $libdir

diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties
index 0e08a6c..9f4af8d 100644 (file)
--- a/org.glite.lb.client/project/version.properties
+++ b/org.glite.lb.client/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=4.0.3
-module.age=1
+module.age=2

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index f7c1c80..68b3e05 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -79,8 +79,8 @@ ifdef LB_PROF
 endif
 
 COMPILE:=libtool --mode=compile ${CC}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
+LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 OBJS:=${JOBID_OBJS} ${PERF_OBJS} lb_plain_io.o events.o mini_http.o query_rec.o \
@@ -167,13 +167,13 @@ mkreports:
        -mkdir -p ${REPORTS}
 
 check.parse: test_parse
-       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_parse ${REPORTS}/parse.xml
+       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_parse ${REPORTS}/parse.xml
 
 test_parse: parse.o test_main.cpp
        ${LINKXX} -o test_parse parse.o ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
 
 check.il: il_test
-       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${LD_LIBRARY_PATH} ./il_test ${REPORTS}/il.xml
+       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./il_test ${REPORTS}/il.xml
 
 il_test: il_test.o il_int_test.o il_string_test.o il_msg_test.o
        ${LINKXX} -o $@ $+ ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
@@ -201,16 +201,16 @@ olddoc: generate events.tex status.tex
        doxygen CPP.dox
 
 install: 
-       mkdir -p ${PREFIX}/lib
+       mkdir -p ${PREFIX}/${libdir}
        mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples
-       ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${MAILDIR_LIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${MAILDIR_LIB} ${PREFIX}/${libdir}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} )
 #      cp -r C CPP ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ;
        (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) ;
        ${INSTALL} -m 644 ${GEN_HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix} ;
-       ${INSTALL} -m 644 ${STATICLIB} ${THRSTATICLIB} ${PREFIX}/lib;
+       ${INSTALL} -m 644 ${STATICLIB} ${THRSTATICLIB} ${PREFIX}/${libdir};
        if [ x${LB_STANDALONE} = xyes ]; then \
                mkdir -p ${PREFIX}/include/glite/wmsutils/jobid ; \
                ${INSTALL} -m 644 glite/wmsutils/jobid/*.h ${PREFIX}/include/glite/wmsutils/jobid/ ; \

diff --git a/org.glite.lb.common/project/ChangeLog b/org.glite.lb.common/project/ChangeLog
index 434201f..7fe4f97 100644 (file)
--- a/org.glite.lb.common/project/ChangeLog
+++ b/org.glite.lb.common/project/ChangeLog
@@ -45,9 +45,12 @@
 7.0.3-1
 - Support for background purge funcionality
 
+7.0.3-2
+- install libraries into $libdir
+- buildtime dependency on c-ares
+
 7.0.4-1
 - Fixed test initiation in Makefile
 
 7.0.4-2
 - Buildtime dependency on c-ares
-

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 01161ab..40cd218 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -48,10 +48,10 @@ CFLAGS:=${DEBUG} \
        ${COVERAGE_FLAGS} \
        ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} 
 
-LDFLAGS:=-L${stagedir}/lib \
+LDFLAGS:=-L${stagedir}/${libdir} \
        ${COVERAGE_FLAGS} 
 LINK:=libtool --mode=link ${CC} ${LDFLAGS}
-LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 #ifneq (${expat_prefix},/usr)

diff --git a/org.glite.lb.logger/project/ChangeLog b/org.glite.lb.logger/project/ChangeLog
index 4eae228..b9eae69 100644 (file)
--- a/org.glite.lb.logger/project/ChangeLog
+++ b/org.glite.lb.logger/project/ChangeLog
@@ -49,3 +49,5 @@
 2.0.4-1
 - Man page update
 
+2.0.4-2
+- install libraries into $libdir

diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties
index 6cf7a4c..f217dfa 100644 (file)
--- a/org.glite.lb.logger/project/version.properties
+++ b/org.glite.lb.logger/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=2.0.4
-module.age=1
+module.age=2

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index a87b2db..e822088 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -87,20 +87,20 @@ CFLAGS:= \
 CXXFLAGS:=${CFLAGS}
 
 ifdef LB_PROF
-       SRVBONES_LIB:= ${stagedir}/lib/libglite_lbu_server_bones.la
-       LB_COMMON_LIB:=${stagedir}/lib/libglite_lb_common_${nothrflavour}.la
-       LB_UTILS_DB_LIB:=${stagedir}/lib/libglite_lbu_db.la
+       SRVBONES_LIB:= ${stagedir}/${libdir}/libglite_lbu_server_bones.la
+       LB_COMMON_LIB:=${stagedir}/${libdir}/libglite_lb_common_${nothrflavour}.la
+       LB_UTILS_DB_LIB:=${stagedir}/${libdir}/libglite_lbu_db.la
        CFLAGS:=${CFLAGS} -pg -g
        LDFLAGS:=${LDFLAGS} -pg
 else
-       SRVBONES_LIB:= -L${stagedir}/lib -lglite_lbu_server_bones
-       LB_COMMON_LIB:=-L${stagedir}/lib -lglite_lb_common_${nothrflavour}
-       LB_UTILS_DB_LIB:=-L${stagedir}/lib -lglite_lbu_db
-       LDFLAGS:= -L${stagedir}/lib
+       SRVBONES_LIB:= -L${stagedir}/${libdir} -lglite_lbu_server_bones
+       LB_COMMON_LIB:=-L${stagedir}/${libdir} -lglite_lb_common_${nothrflavour}
+       LB_UTILS_DB_LIB:=-L${stagedir}/${libdir} -lglite_lbu_db
+       LDFLAGS:= -L${stagedir}/${libdir}
 endif
 
-# LB_MACHINE_LIB:=${stagedir}/lib/libglite_lb_statemachine.a
-LB_MACHINE_LIB:=-L${stagedir}/lib -lglite_lb_statemachine
+# LB_MACHINE_LIB:=${stagedir}/${libdir}/libglite_lb_statemachine.a
+LB_MACHINE_LIB:=-L${stagedir}/${libdir} -lglite_lb_statemachine
 
 ifdef LBS_DB_PROFILE
        CFLAGS:=${CFLAGS} -DLBS_DB_PROFILE
@@ -111,11 +111,11 @@ TEST_INC:=-I${cppunit_prefix}/include
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib  ${LDFLAGS} 
-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/lib
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir}  ${LDFLAGS} 
+SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir}
 # XXX: not used? LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
 #ifeq ($(shell ls ${gsoap_prefix}/bin/soapcpp2),${gsoap_prefix}/bin/soapcpp2)
@@ -163,7 +163,7 @@ EXT_LIBS:=  \
        ${LCAS_LIBS} \
        ${VOMS_LIBS}
 
-COMMON_LIBS:= -L${stagedir}/lib  -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour} -lglite_lbu_trio -lglite_lbu_maildir
+COMMON_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour} -lglite_lbu_trio -lglite_lbu_maildir
 
 BKSERVER_BASE_OBJS:= \
        bkserverd.o il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \
@@ -176,10 +176,10 @@ BKSERVER_BASE_OBJS:= \
 gsoap_version ?= ${gsoap_default_version}
 
 dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
-ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
        langflavour:=_c
 endif
-GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
+GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
        BKSERVER_OBJS:= \
@@ -221,10 +221,10 @@ WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault
 WS_CLIENT_LIBS:= ${GSOAP_LIB} -lglite_lb_common_${nothrflavour} \
        -lglite_lb_common_${nothrflavour}
 
-# WS_CLIENT_LIBS:= -L${stagedir}/lib \
+# WS_CLIENT_LIBS:= -L${stagedir}/${libdir} \
 #                 -lglite_lb_client_${nothrflavour} \
 #                 -lglite_lb_common_${nothrflavour} \
-#                 -L${gsoap_prefix}/lib -lgsoap \
+#                 -L${gsoap_prefix}/${libdir} -lgsoap \
 #                 -lglite_security_gsoap_plugin_${nothrflavour} \
 #                 ${EXT_LIBS}
 # 
@@ -295,7 +295,7 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
        rm -f LBTypes.wsdl
 
 test.xml: test_xml
-       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_xml
+       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_xml
 
 test_xml: test_xml.cpp
        ${CXX} -c ${CFLAGS} ${TEST_INC} $<
@@ -313,7 +313,7 @@ test_query_events: ${query_events_objs}
        ${TEST_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib}
 
 test.soapconv: test_soap_conv
-       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_soap_conv
+       LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_soap_conv
 
 test_soap_conv: test_soap_conv.cpp ${WS_CLIENT_OBJS}
        ${CXX} -c ${CFLAGS} ${TEST_INC} $<
@@ -343,7 +343,7 @@ install:
        -mkdir -p ${PREFIX}/bin ${PREFIX}/etc ${PREFIX}/etc/init.d ${PREFIX}/interface
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/share/man/man1
-       -mkdir -p ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix}
        mkdir -p ${PREFIX}/share/man/man8
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
@@ -352,9 +352,9 @@ install:
        for p in bkserverd bkindex mon-db; do \
                ${INSTALL} -m 755 "glite-lb-$$p" "${PREFIX}/bin/glite-lb-$$p"; \
        done
-       -mkdir -p ${PREFIX}/lib/modules
-       ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${PREFIX}/lib/modules
-       ln -sf liblcas_lb.so ${PREFIX}/lib/modules/lcas_lb.mod
+       -mkdir -p ${PREFIX}/${libdir}/modules
+       ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${PREFIX}/${libdir}/modules
+       ln -sf liblcas_lb.so ${PREFIX}/${libdir}/modules/lcas_lb.mod
 
        for f in dbsetup.sql index.conf.template; do \
                ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc; \
@@ -365,7 +365,7 @@ install:
 
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix}
        (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix})
-       install -m 644 ${STATIC_LIB_BK} ${PREFIX}/lib
+       install -m 644 ${STATIC_LIB_BK} ${PREFIX}/${libdir}
        ${INSTALL} -m 644 ${top_srcdir}/interface/srv_perf.h ${PREFIX}/include/${globalprefix}/${lbprefix}
        ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man8
 ifdef LB_PERF

diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog
index 795111e..62b4165 100644 (file)
--- a/org.glite.lb.server/project/ChangeLog
+++ b/org.glite.lb.server/project/ChangeLog
@@ -103,3 +103,6 @@ Crystal ball:
 - Reflect updates in the database module
 - Adjusted grey job purges (purge undefined jobs etc.)
 
+2.0.3-3
+- install libraries into $libdir
+- buildtime dependency pn c-ares

diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties
index 0ad0c54..69f2f17 100644 (file)
--- a/org.glite.lb.server/project/version.properties
+++ b/org.glite.lb.server/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $
 module.version=2.0.3
-module.age=2
+module.age=3

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 97d3dbc..4f0a0d1 100644 (file)
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -29,11 +29,11 @@ CFLAGS:= \
        -I${top_srcdir}/interface 
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib  ${LDFLAGS} 
-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/lib
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir}  ${LDFLAGS} 
+SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
 ifneq (${classads_prefix},/usr)
@@ -43,8 +43,8 @@ endif
 classadslib := ${classadslib} -lclassad
 
 EXT_LIBS:=
-COMMON_LIBS:= -L${stagedir}/lib  -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour}
-PLUGIN_LIBS:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour}\
+COMMON_LIBS:= -L${stagedir}/${libdir}  -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour}
+PLUGIN_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common_${nothrflavour}\
        ${classadslib} -lstdc++ ${expatlib} -lexpat\
 
 PLUGIN_LOBJS:=seqcode_aux.lo process_event.lo process_event_pbs.lo process_event_condor.lo lb_plugin.lo
@@ -73,9 +73,9 @@ stage: compile
        $(MAKE) install PREFIX=${stagedir}
 
 install:
-       -mkdir -p ${PREFIX}/lib ${PREFIX}/interface ${PREFIX}/include/glite/lb
-       install -m 644 ${MACHINE_LIB} ${PREFIX}/lib 
-       ${INSTALL} -m 755 ${PLUGIN_LIB} ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir} ${PREFIX}/interface ${PREFIX}/include/glite/lb
+       install -m 644 ${MACHINE_LIB} ${PREFIX}/${libdir} 
+       ${INSTALL} -m 755 ${PLUGIN_LIB} ${PREFIX}/${libdir}
        install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${PREFIX}/interface
        install -m 644 lb-job-attrs2.xsd ${PREFIX}/interface
        install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${PREFIX}/interface

diff --git a/org.glite.lb.state-machine/project/ChangeLog b/org.glite.lb.state-machine/project/ChangeLog
index 11947b8..aa9379f 100644 (file)
--- a/org.glite.lb.state-machine/project/ChangeLog
+++ b/org.glite.lb.state-machine/project/ChangeLog
@@ -27,3 +27,5 @@
 1.0.2-1
 - Do not override network server endpoint with data from transfer event
 
+1.0.2-2
+- install libraries into $libdir

diff --git a/org.glite.lb.state-machine/project/version.properties b/org.glite.lb.state-machine/project/version.properties
index 67ab76c..03e254a 100644 (file)
--- a/org.glite.lb.state-machine/project/version.properties
+++ b/org.glite.lb.state-machine/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=1.0.2
-module.age=1
+module.age=2

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 3595dde..63bdaa2 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -35,14 +35,14 @@ CFLAGS:= \
        -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE
-LDFLAGS:=-L${stagedir}/lib
+LDFLAGS:=-L${stagedir}/${libdir}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib  ${LDFLAGS} 
-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/lib
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir}  ${LDFLAGS} 
+SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/${libdir}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
 ifneq (${expat_prefix},/usr)
@@ -76,7 +76,7 @@ statistics: ${STATISTICS_OBJS}
        ${LINK} -rdynamic -o $@ ${STATISTICS_OBJS} ${COMMON_LIB} ${JP_LIBS} ${EXT_LIBS} 
 
 state_history: state_history.o
-       ${LINK} -o $@ state_history.o -L${stagedir}/lib -lglite_lb_statemachine ${PLUS_LIB}
+       ${LINK} -o $@ state_history.o -lglite_lb_statemachine ${PLUS_LIB}
 
 check: compile 
 
@@ -94,7 +94,7 @@ stage: compile
 
 install:
        -mkdir -p ${PREFIX}/bin 
-       -mkdir -p ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/share/man/man1
        -mkdir -p ${PREFIX}/share/man/man8

diff --git a/org.glite.lb.utils/project/ChangeLog b/org.glite.lb.utils/project/ChangeLog
index f2508fe..b3ea5d3 100644 (file)
--- a/org.glite.lb.utils/project/ChangeLog
+++ b/org.glite.lb.utils/project/ChangeLog
@@ -17,3 +17,5 @@
 - Man page update
 - Support for background purge funcionality
 
+2.0.3-2
+- install libraries into $libdir

diff --git a/org.glite.lb.utils/project/version.properties b/org.glite.lb.utils/project/version.properties
index 368e298..8513689 100755 (executable)
--- a/org.glite.lb.utils/project/version.properties
+++ b/org.glite.lb.utils/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=2.0.3
-module.age=1
+module.age=2

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index da58e0e..abd107b 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -354,7 +354,7 @@ for my $jar (keys %need_jars) {
        'lb.client' => [ qw/
                lb.types:B lb.common
                lbjp-common.trio
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                security.gss
        / ],
        'lb.client-java' => [ qw/
@@ -363,7 +363,7 @@ for my $jar (keys %need_jars) {
                jobid.api-java
        / ],
        'lb.common' => [ qw/
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                lb.types:B lbjp-common.trio security.gss
        / ],
        'lb.doc' => [ qw/lb.types:B/ ],

diff --git a/org.glite.lb/project/version.properties b/org.glite.lb/project/version.properties
index 8afaa81..9f3167f 100644 (file)
--- a/org.glite.lb/project/version.properties
+++ b/org.glite.lb/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/glite/org.glite.lb/project/version.properties,v 1.164 2008/01/09 15:35:55 mmulac Exp $
 module.version=2.0.5
-module.age=5
+module.age=7

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index 94eb1cf..c2957fa 100644 (file)
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -44,13 +44,13 @@ ifdef LBS_DB_PROFILE
        CFLAGS:=${CFLAGS} -DLBS_DB_PROFILE
 endif
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
-LDFLAGS:=-L${stagedir}/lib ${COVERAGE_FLAGS}
+LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 EXT_LIBS:=${MYSQL_LIBS} -lglite_lbu_trio -lpthread -ldl
@@ -121,12 +121,12 @@ distbin:
        rm -rf tmpbuilddir
         
 install: all
-       -mkdir -p ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        -cp -r C ${PREFIX}/share/doc/${package}-${version}
-       ${INSTALL} -m 755 "libglite_lbu_db.la" "${PREFIX}/lib/libglite_lbu_db.la"; \
+       ${INSTALL} -m 755 "libglite_lbu_db.la" "${PREFIX}/${libdir}/libglite_lbu_db.la"; \
        ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
 
 clean:

diff --git a/org.glite.lbjp-common.db/project/ChangeLog b/org.glite.lbjp-common.db/project/ChangeLog
index b1bc979..aa3f576 100644 (file)
--- a/org.glite.lbjp-common.db/project/ChangeLog
+++ b/org.glite.lbjp-common.db/project/ChangeLog
@@ -29,6 +29,9 @@
 1.0.1-3
 - Module repacked.
 
+1.0.1-4
+- install libraries into $libdir
+
 2.0.0-1
 - Multiple DB backends supported
 - API enhanced to support multiple database backends

diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile
index 9bcaf55..39bf384 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/Makefile
+++ b/org.glite.lbjp-common.jp-interface/Makefile
@@ -30,7 +30,7 @@ version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
 
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} -rpath ${stagedir}/lib ${version_info}
+LINK:=libtool --mode=link ${CC} ${LDFLAGS} -rpath ${stagedir}/${libdir} ${version_info}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
@@ -40,13 +40,13 @@ HDRS:=types.h context.h attr.h known_attr.h backend.h builtin_plugins.h file_plu
 SRCS:=context.c attr.c utils.c indexdb.c
 OBJS:=${SRCS:.c=.lo}
 THROBJS:=${OBJS:.o=.thr.lo}
-LIBS:=-L${stagedir}/lib -lglite_jobid -lglite_lbu_db
+LIBS:=-L${stagedir}/${libdir} -lglite_jobid -lglite_lbu_db
 THRLIBS:=${LIBS}
 
 commonlib:= libglite_jp_common_${nothrflavour}.la
 commonlib_thr:= libglite_jp_common_${thrflavour}.la
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit -ldl
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit -ldl
 TEST_INC:=-I${cppunit_prefix}/include
 
 
@@ -75,8 +75,8 @@ stage: compile
 install:
        -mkdir -p ${PREFIX}/include/${globalprefix}/${jpprefix}
        cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jpprefix}
-       -mkdir -p ${PREFIX}/lib
-       ${INSTALL} -m 755 ${commonlib} ${commonlib_thr} ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
+       ${INSTALL} -m 755 ${commonlib} ${commonlib_thr} ${PREFIX}/${libdir}
 
 clean:
        rm -rvf *.o *.lo .libs lib*

diff --git a/org.glite.lbjp-common.jp-interface/project/ChangeLog b/org.glite.lbjp-common.jp-interface/project/ChangeLog
index 8537bb9..e9afcec 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/ChangeLog
+++ b/org.glite.lbjp-common.jp-interface/project/ChangeLog
@@ -16,3 +16,5 @@
 1.0.0-6
 - Module repacked.
 
+1.0.0-7
+- install libraries into $libdir

diff --git a/org.glite.lbjp-common.jp-interface/project/version.properties b/org.glite.lbjp-common.jp-interface/project/version.properties
index 11299ee..191f733 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/version.properties
+++ b/org.glite.lbjp-common.jp-interface/project/version.properties
@@ -1,3 +1,3 @@
 #: /cvs/jra1mw/org.glite.lbjp-common.jp-interface/project/version.properties,v 1.1.1.1 2009/01/21 14:43:52 zsustr Exp $
 module.version=1.0.0
-module.age=6
+module.age=7

diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index 64d0c58..d30e78b 100644 (file)
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -32,10 +32,10 @@ CFLAGS:= \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE
 
-LDFLAGS:=-L${stagedir}/lib ${COVERAGE_FLAGS}
+LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 EXT_LIBS:=
@@ -69,10 +69,10 @@ stage: compile
        $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
 install: all
-       -mkdir -p ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
-       ${INSTALL} -m 755 "libglite_lbu_maildir.la" "${PREFIX}/lib/libglite_lbu_maildir.la"; \
+       ${INSTALL} -m 755 "libglite_lbu_maildir.la" "${PREFIX}/${libdir}/libglite_lbu_maildir.la"; \
        ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
 
 clean:

diff --git a/org.glite.lbjp-common.maildir/project/ChangeLog b/org.glite.lbjp-common.maildir/project/ChangeLog
index 241af0a..08b6ad0 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/ChangeLog
+++ b/org.glite.lbjp-common.maildir/project/ChangeLog
@@ -7,3 +7,5 @@
 1.0.0-3
 - configure script update
 
+1.0.0-4
+- install libraries into $libdir

diff --git a/org.glite.lbjp-common.maildir/project/version.properties b/org.glite.lbjp-common.maildir/project/version.properties
index af720aa..95b4198 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/version.properties
+++ b/org.glite.lbjp-common.maildir/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lbjp-common.maildir/project/version.properties,v 1.1 2007/11/01 20:17:45 valtri Exp $
 module.version=1.0.0
-module.age=3
+module.age=4

diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index 4bfdffd..22bf1f2 100644 (file)
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -24,7 +24,7 @@ ifdef LB_PROF
 endif
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 STATICLIB:=libglite_lbu_server_bones.a
@@ -64,9 +64,9 @@ doc:
 
 install:
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
-       mkdir -p ${PREFIX}/lib
-       ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/lib
-       ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/lib ; \
+       mkdir -p ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/${libdir} ; \
        cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
 
 clean:

diff --git a/org.glite.lbjp-common.server-bones/project/ChangeLog b/org.glite.lbjp-common.server-bones/project/ChangeLog
index 1d25f18..2d9aabf 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/ChangeLog
+++ b/org.glite.lbjp-common.server-bones/project/ChangeLog
@@ -7,3 +7,5 @@
 1.0.0-4
 - configure script update
 
+1.0.0-5
+- install libraries into $libdir

diff --git a/org.glite.lbjp-common.server-bones/project/version.properties b/org.glite.lbjp-common.server-bones/project/version.properties
index 78dfc90..82c4e39 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/version.properties
+++ b/org.glite.lbjp-common.server-bones/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lbjp-common.server-bones/project/version.properties,v 1.2 2009/01/21 10:44:34 zsustr Exp $
 module.version=1.0.0
-module.age=4
+module.age=5

diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index 2d0d747..af7b157 100644 (file)
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -22,8 +22,8 @@ DEBUG:=-g -O0 -Wall
 CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION
 
 COMPILE:=libtool --mode=compile ${CC}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
+LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
 REPORTS:=${top_srcdir}/reports
@@ -96,11 +96,11 @@ distbin:
        rm -rf tmpbuilddir
 
 install: all
-       -mkdir -p ${PREFIX}/lib
+       -mkdir -p ${PREFIX}/${libdir}
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbuprefix}
-       ${INSTALL} -m 644 ${LTLIB} ${STATICLIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LTLIB} ${STATICLIB} ${PREFIX}/${libdir}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbuprefix})
 

diff --git a/org.glite.lbjp-common.trio/project/ChangeLog b/org.glite.lbjp-common.trio/project/ChangeLog
index abff374..5b525d2 100644 (file)
--- a/org.glite.lbjp-common.trio/project/ChangeLog
+++ b/org.glite.lbjp-common.trio/project/ChangeLog
@@ -10,6 +10,9 @@
 1.0.0-5
 - configure script update
 
+1.0.0-6
+- install libraries into $libdir
+
 1.0.1-1
 - Fixed build with newer gcc versions