ETICS-less build:

- better defaults
- using DESTDIR for staging
- libtool & rpath
- bugfixes

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index b73e4e9..85942a8 100644 (file)
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -57,7 +57,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}${prefix}/${libdir}
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${stagedir}${prefix}/${libdir}
 
 check: compile base64_test
        ./base64_test base64_test.xml

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 3ebefaf..ed4a276 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -199,28 +199,28 @@ default: all
 
 ifeq (${thrflavour},)
 ${LIB}: ${LIBOBJS}
-       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${stagedir}${prefix}/${libdir} \
                        ${COMMON_LIB} ${TRIO_LIB} \
                        -lglite_security_gss
 
 ${PLUSLIB}: ${PLUSOBJS} ${LIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${stagedir}${prefix}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
 else
 ${NOTHRLIB}: ${LIBOBJS}
-       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${stagedir}${prefix}/${libdir} \
                        ${COMMON_LIB_NOTHR} ${TRIO_LIB} \
                        -lglite_security_gss_${nothrflavour}
 
 ${THRLIB}: ${LIBTHROBJS}
-       ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} \
+       ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${stagedir}${prefix}/${libdir} \
                        ${COMMON_LIB_THR} ${TRIO_LIB} \
                        -lglite_security_gss_${thrflavour}
 
 ${NOTHRPLUSLIB}: ${PLUSOBJS} ${NOTHRLIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${NOTHRLIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${stagedir}${prefix}/${libdir} ${NOTHRLIB} ${PLUS_EXTRA_LIB}
 
 ${THRPLUSLIB}: ${PLUSTHROBJS} ${THRLIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}${prefix}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${stagedir}${prefix}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB}
 endif
 
 logevent: logevent.o args.o

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 3d5f4fb..9866245 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -228,7 +228,7 @@ install:
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
 #      cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ;
-       (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) ;
+       (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) ;
        ${INSTALL} -m 644 ${GEN_HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} ;
        ${INSTALL} -m 644 ${lib_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir};
        if [ x${LB_STANDALONE} = xyes ]; then \

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 5349d48..e2e1fda 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -71,7 +71,7 @@ install: compile
        ${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/harvester-test-dbsetup.sql
        ${INSTALL} -m 444 ${top_srcdir}/doc/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 444 glite-lb-harvester.8 ${DESTDIR}${PREFIX}${prefix}/share/man/man8
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${prefix}${sysconfdir}/init.d/glite-lb-harvester
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-harvester
 
 clean:
        rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index a221588..88f81ad 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -26,8 +26,8 @@
 use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
-my $prefix = $pwd.'/stage';
-my $stagedir;
+my $prefix = '/usr';
+my $stagedir = $pwd.'/stage';
 my $root = '';
 my $sysroot = '';
 my $sysconfdir;
@@ -220,7 +220,7 @@ $prefix=~s/\/$//;
 $stage=~s/\/$//;
 $root=~s/\/$//;
 $sysroot=~s/\/$//;
-if (not $sysconfdir) { $sysconfdir = "$prefix/etc"; }
+if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; }
 $sysconfdir=~s/\/$//;
 
 $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq '';
@@ -293,7 +293,7 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
-$stagedir = $prefix unless $stagedir;
+$stagedir = $root.$prefix unless $stagedir;
 
 if ($mode eq 'build') {
        print "Writing config.status\n";
@@ -382,7 +382,7 @@ sub mode_build {
                my $full = full($_);
                my $build = $buildroot{$_};
        
-               print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n";
+               print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install DESTDIR=$stagedir\n\n";
        }
        
        close MAK;

diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index 905d1b6..5ccf485 100644 (file)
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -66,7 +66,7 @@ stage: compile
 install: compile
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} 
        ${INSTALL} -m 644 ${top_srcdir}/src/log.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} 
-       mkdir -p ${DESTDIE}${PREFIX}${prefix}/share/doc/${package}-${version}
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb