Improve packaging of glite-lb-types - perl stuff:

- install tools into /usr/bin instead of /usr/sbin and update Makefiles
- install perl modules into vendor perl directory (different across distributions)

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 405d99f..08f6485 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -30,7 +30,7 @@ JAVAC:=${jdk_prefix}/bin/javac
 JAVAH:=${jdk_prefix}/bin/javah
 JAVA:=${jdk_prefix}/bin/java
 
-GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
+GEN:=${stagedir}${prefix}/bin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
 AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
 axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java ${axis_prefix}/share/java/axis /usr/share/java /usr/lib/java /usr/lib/java/axis)
 trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 4645259..2d4727c 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -29,9 +29,9 @@ VERSION_AHEAD=-3
 rpath?=${PREFIX}${prefix}/${libdir}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 GENSAM=${top_srcdir}/examples/gen_sample_job
-check_version_pl=$(shell sbin_dir=${stagedir}${prefix}/sbin; if test -f $${sbin_dir}/glite-lb-check_version.pl; then echo $${sbin_dir}; else echo ${prefix}/sbin; fi)/glite-lb-check_version.pl
+check_version_pl=$(shell bin_dir=${stagedir}${prefix}/bin; if test -f $${bin_dir}/glite-lb-check_version.pl; then echo $${bin_dir}; else echo ${prefix}/bin; fi)/glite-lb-check_version.pl
 CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${check_version_pl}
 
 SUFFIXES = .T .l

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 35c96c0..199e024 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -21,7 +21,7 @@ version=${module.version}
 jobiddir=${top_srcdir}/../org.glite.jobid.api-c
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 
 SUFFIXES = .T
 

diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile
index 3f9270e..42615af 100644 (file)
--- a/org.glite.lb.doc/Makefile
+++ b/org.glite.lb.doc/Makefile
@@ -29,7 +29,7 @@ LATEX = $(KPATH) latex
 PDFLATEX = $(KPATH) pdflatex
 BIBTEX = $(KPATHBIB) bibtex
 DVIPS = $(KPATH) dvips
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 INSTALL=install
 
 all: generate doc

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 2173ff9..5cfd082 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -77,7 +77,7 @@ ifeq ($(gsoap_version),2.7.0)
 else
        VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/examples:${top_srcdir}/project
 endif
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 
 SUFFIXES = .T 
 

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 7a3b747..86ba12c 100644 (file)
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -18,7 +18,7 @@ VPATH = ${top_srcdir}/src:${top_srcdir}/interface
 
 CC=gcc
 CXX=g++
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 
 SUFFIXES = .T 
 

diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile
index 936f250..f8a2bc3 100644 (file)
--- a/org.glite.lb.types/Makefile
+++ b/org.glite.lb.types/Makefile
@@ -11,6 +11,9 @@ version=${module.version}
 
 globalprefix=glite
 lbprefix=lb
+perlinstalldir=$(shell eval `perl -V:installvendorlib`; echo $$installvendorlib)
+
+VPATH=${top_srcdir}
 
 SOURCES=interface/*.h at3.in *.pm *.T check_version.pl Makefile
 SOURCES_EXEC=at3.in check_version.pl
@@ -22,24 +25,29 @@ HDRS=lb_types.h
 
 all: compile
 
-compile:
+compile: at3
+
+at3: at3.in
+       sed -e 's:@prefix@:${PREFIX}${prefix}:' -e 's:@perlinstalldir@:${PREFIX}${perlinstalldir}:' $< > $@ || ( rm -f $@; false )
+       chmod +x $@
 
 stage: compile
        $(MAKE) install PREFIX=${stagedir}
 
 install: compile
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3 ${DESTDIR}${PREFIX}${prefix}/sbin ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
+       mkdir -p ${DESTDIR}${PREFIX}${perlinstalldir}/gLite/LB ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3 ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
        for p in ${PM} ; do \
-               install -m 644 ${top_srcdir}/$$p ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB; \
+               install -m 644 ${top_srcdir}/$$p ${DESTDIR}${PREFIX}${perlinstalldir}/gLite/LB; \
        done
        for p in ${T} ; do \
                install -m 644 ${top_srcdir}/$$p ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3; \
        done
-       install -m 755 ${top_srcdir}/at3.in ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-at3
-       install -m 755 ${top_srcdir}/check_version.pl ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-check_version.pl
+       install -m 755 ${top_srcdir}/at3 ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-at3
+       install -m 755 ${top_srcdir}/check_version.pl ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-check_version.pl
        (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) 
        
 clean:
+       rm -fv at3
        rm -rvf dist ${package}-*.tar.gz
 
 distclean:

diff --git a/org.glite.lb.types/at3.in b/org.glite.lb.types/at3.in
index 3e12e3c..8a8bbd0 100755 (executable)
--- a/org.glite.lb.types/at3.in
+++ b/org.glite.lb.types/at3.in
@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-use File::Basename;
-
 my $lines = $ENV{AT3_LINES};
+my ($prefix, $perlinstalldir);
 
-my $prefix;
-use File::Basename;
+BEGIN {
+       $prefix = '@prefix@';
+       $perlinstalldir = '@perlinstalldir@';
+}
 
-BEGIN{ $prefix = dirname($0)."/.."; }
+use lib "$perlinstalldir";
 
-use lib "$prefix/share/perl";
 use gLite::LB::MultiStruct;
 require "$prefix/share/glite-lb/at3/types.T";
 

diff --git a/org.glite.lb.types/project/debian.glite-lb-types.dirs b/org.glite.lb.types/project/debian.glite-lb-types.dirs
index e4b2eb7..548a024 100644 (file)
--- a/org.glite.lb.types/project/debian.glite-lb-types.dirs
+++ b/org.glite.lb.types/project/debian.glite-lb-types.dirs
@@ -1,2 +1,3 @@
 usr/include/glite/lb
-usr/share/perl/gLite/LB
+usr/share/perl5/gLite
+usr/share/perl5/gLite/LB

diff --git a/org.glite.lb.types/project/debian.glite-lb-types.install b/org.glite.lb.types/project/debian.glite-lb-types.install
index d9283fd..6e08aa2 100644 (file)
--- a/org.glite.lb.types/project/debian.glite-lb-types.install
+++ b/org.glite.lb.types/project/debian.glite-lb-types.install
@@ -1,4 +1,4 @@
 usr/include/glite/lb/*
-usr/sbin/*
-usr/share/perl/gLite/LB/*.pm
+usr/bin/*
+usr/share/perl5/gLite/LB/*.pm
 usr/share/glite-lb/at3/*.T

diff --git a/org.glite.lb.types/project/glite-lb-types.spec b/org.glite.lb.types/project/glite-lb-types.spec
index 4d1f7ad..c0f2105 100644 (file)
--- a/org.glite.lb.types/project/glite-lb-types.spec
+++ b/org.glite.lb.types/project/glite-lb-types.spec
@@ -43,16 +43,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
 %dir /usr/share/glite-lb/at3/
-%dir /usr/share/perl/
-%dir /usr/share/perl/gLite/
-%dir /usr/share/perl/gLite/LB/
+%dir %{perl_vendorlib}/gLite/
+%dir %{perl_vendorlib}/gLite/LB/
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
+%{_bindir}/glite-lb-at3
+%{_bindir}/glite-lb-check_version.pl
 %{_includedir}/glite/lb/*
-/usr/sbin/glite-lb-at3
-/usr/sbin/glite-lb-check_version.pl
-/usr/share/perl/gLite/LB/StructField.pm
-/usr/share/perl/gLite/LB/MultiStruct.pm
+%{perl_vendorlib}/gLite/LB/StructField.pm
+%{perl_vendorlib}/gLite/LB/MultiStruct.pm
 /usr/share/glite-lb/at3/events.T
 /usr/share/glite-lb/at3/status.T
 /usr/share/glite-lb/at3/types.T

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index f879331..1b9260a 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -27,7 +27,7 @@ SOURCES=\
 SOURCES_EXEC=examples/*.sh src/*.sh
 
 CC=gcc
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 
 SUFFIXES = .T
 

diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index bbd00cb..1e61054 100644 (file)
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -20,7 +20,7 @@ version=${module.version}
 SUFFIXES = .T
 
 VPATH=${top_srcdir}/src
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+AT3=${stagedir}${prefix}/bin/glite-lb-at3
 XSLTPROC:=xsltproc --nonet
 XMLLINT:=xmllint --nonet
 TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0