FHS and glite-PX.

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 88f81ad..6c9dbc4 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -105,7 +105,7 @@ my %externs = (
        },
        voms => {
                prefix => '/opt/glite',
-               pkg => 'voms-1.0'
+               pkg => 'voms-2.0'
        },
        gridsite => {
                prefix => '/opt/glite'
@@ -913,7 +913,7 @@ sub mode_etics {
                my $localprefix = $emi ? '/usr' : '';
                my $sysconfdir = ' --sysconfdir=/etc';
                # exception for yaims in EMI for now: prefix /opt/glite
-               if ($emi and $module eq 'yaim') { $localprefix = '/opt/glite'; $sysconfdir = ''; }
+               if ($emi and ($module =~ /yaim/ or $module =~ /^glite-/)) { $localprefix = '/opt/glite'; $sysconfdir = ''; }
                $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=${localprefix} --stage=\${stageDir} --sysroot=\${package.prefix}$sysconfdir --libdir=\${libdir} --module $subsys.$module @copts";
                $cmd{compile} = 'make';
                $cmd{test} = 'make check';

diff --git a/org.glite.px.glite-PX/Makefile b/org.glite.px.glite-PX/Makefile
index 4618aa5..701c01e 100644 (file)
--- a/org.glite.px.glite-PX/Makefile
+++ b/org.glite.px.glite-PX/Makefile
@@ -3,6 +3,7 @@ stagedir=.
 package=glite-PX
 version=0.0.0
 PREFIX=/opt/glite
+prefix=
 
 -include Makefile.inc
 -include ../project/version.properties
@@ -16,8 +17,8 @@ default all:
        echo "NA" > update
 
 install:
-       mkdir -p ${PREFIX}/release/glite-PX
-       cp -fp LICENSE COPYRIGHT node-version arch service update ${PREFIX}/release/glite-PX/
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/release/glite-PX
+       cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${prefix}/release/glite-PX/
 
 stage:
        $(MAKE) install PREFIX=${stagedir}

diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile
index 4259656..d4e6b7b 100644 (file)
--- a/org.glite.px.myproxy-yaim/Makefile
+++ b/org.glite.px.myproxy-yaim/Makefile
@@ -3,6 +3,7 @@ stagedir=.
 package=glite-px-myproxy-yaim
 version=0.0.0
 PREFIX=/opt/glite
+prefix=
 sysconfdir=/opt/glite/etc
 
 -include Makefile.inc
@@ -11,25 +12,26 @@ sysconfdir=/opt/glite/etc
 all:
 
 install:
-       mkdir -p $(PREFIX)/yaim/functions/
-       mkdir -p $(PREFIX)/yaim/node-info.d
-       mkdir -p $(PREFIX)/yaim/examples/siteinfo/services
-       mkdir -p $(PREFIX)/yaim/etc/versions
-       mkdir -p $(PREFIX)/yaim/defaults
-       install -m 0644 $(top_srcdir)/config/services/glite-px $(PREFIX)/yaim/examples/siteinfo/services/glite-px
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/functions/
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/examples/siteinfo/services
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/etc/versions
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/yaim/defaults
+       install -m 0644 $(top_srcdir)/config/services/glite-px ${DESTDIR}${PREFIX}${prefix}/yaim/examples/siteinfo/services/glite-px
        for c in gip_px  info_service_px  proxy_server ; do \
-               install -m 0644 $(top_srcdir)/config/functions/config_$$c $(PREFIX)/yaim/functions; \
+               install -m 0644 $(top_srcdir)/config/functions/config_$$c ${DESTDIR}${PREFIX}${prefix}/yaim/functions; \
        done
        # dirty hack for EPEL - flavour-less globus not initialized by gpt
        if test "x$(thrflavour)" = "x"; then \
                grep -v config_globus_clients $(top_srcdir)/config/node-info.d/glite-px > glite-px; \
-               install -m 0644 glite-px $(PREFIX)/yaim/node-info.d; \
+               install -m 0644 glite-px ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d; \
+               prefix=/usr sysconfdir=/etc $(top_srcdir)/config/defaults/glite-px.pre.sh > glite-px.pre; \
        else \
-               install -m 0644 $(top_srcdir)/config/node-info.d/glite-px $(PREFIX)/yaim/node-info.d; \
+               install -m 0644 $(top_srcdir)/config/node-info.d/glite-px ${DESTDIR}${PREFIX}${prefix}/yaim/node-info.d; \
+               prefix=${sysrootdir}${prefix} sysconfdir=${sysconfdir} $(top_srcdir)/config/defaults/glite-px.pre.sh > glite-px.pre; \
        fi
-       prefix=$(PREFIX) sysconfdir=$(sysconfdir) $(top_srcdir)/config/defaults/glite-px.pre.sh > glite-px.pre
-       install -m 0644 glite-px.pre $(PREFIX)/yaim/defaults
-       echo "$(package) $(module.version)-$(module.age)" > $(PREFIX)/yaim/etc/versions/$(package)
+       install -m 0644 glite-px.pre ${DESTDIR}${PREFIX}${prefix}/yaim/defaults
+       echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${prefix}/yaim/etc/versions/$(package)
 
 stage:
        $(MAKE) install PREFIX=${stagedir}

diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
index dac8ba2..fae97b3 100644 (file)
--- a/org.glite.px.proxyrenewal/Makefile
+++ b/org.glite.px.proxyrenewal/Makefile
@@ -33,8 +33,10 @@ package=glite-security-proxyrenewal
 version=0.0.0
 PREFIX=/opt/glite
 libdir=lib
+prefix=
+sysconfdir=/opt/glite/etc
 
-glite_location=${PREFIX}
+glite_location=${PREFIX}${prefix}
 globus_prefix=/opt/globus
 
 -include Makefile.inc
@@ -177,13 +179,12 @@ distbin:
        rm -rf tmpbuilddir
 
 install:
-       -mkdir -p ${PREFIX}/bin ${PREFIX}/${libdir} ${PREFIX}/include/glite/security/proxyrenewal ${PREFIX}/share/doc/${package}-${version} ${PREFIX}/etc/init.d
-       ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${PREFIX}/${libdir}
-       ${INSTALL} -m 755 ${DAEMON} ${CLIENT} ${PREFIX}/bin
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       cd ${top_srcdir}/interface && ${INSTALL} -m 644 renewal.h renewal_core.h ${PREFIX}/include/glite/security/proxyrenewal
-
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-proxy-renewald
+       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ${DESTDIR}${PREFIX}${sysconfdir}/init.d
+       ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+       ${INSTALL} -m 755 ${DAEMON} ${CLIENT} ${DESTDIR}${PREFIX}${prefix}/bin
+       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+       cd ${top_srcdir}/interface && ${INSTALL} -m 644 renewal.h renewal_core.h ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal
+       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-proxy-renewald
 
 
 clean: