From 2201c4b9b514f148b53e2f99382efef107299a07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 3 Mar 2011 12:15:36 +0000 Subject: [PATCH] Resync configure (for remote HEAD builds). --- org.glite.lb.client-java/configure | 16 +++++++++------- org.glite.lb.client/configure | 16 +++++++++------- org.glite.lb.common/configure | 16 +++++++++------- org.glite.lb.doc/configure | 16 +++++++++------- org.glite.lb.glite-LB/configure | 16 +++++++++------- org.glite.lb.harvester/configure | 16 +++++++++------- org.glite.lb.logger-msg/configure | 16 +++++++++------- org.glite.lb.logger/configure | 16 +++++++++------- org.glite.lb.server/configure | 16 +++++++++------- org.glite.lb.state-machine/configure | 16 +++++++++------- org.glite.lb.types/configure | 16 +++++++++------- org.glite.lb.utils/configure | 16 +++++++++------- org.glite.lb.ws-interface/configure | 16 +++++++++------- org.glite.lb.ws-test/configure | 16 +++++++++------- org.glite.lb.yaim/configure | 16 +++++++++------- org.glite.px.glite-PX/configure | 36 +++++++++++++++++++++--------------- org.glite.px.myproxy-yaim/configure | 36 +++++++++++++++++++++--------------- org.glite.px.proxyrenewal/configure | 36 +++++++++++++++++++++--------------- 18 files changed, 198 insertions(+), 150 deletions(-) diff --git a/org.glite.lb.client-java/configure b/org.glite.lb.client-java/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.client-java/configure +++ b/org.glite.lb.client-java/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.client/configure +++ b/org.glite.lb.client/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.common/configure b/org.glite.lb.common/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.common/configure +++ b/org.glite.lb.common/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.doc/configure b/org.glite.lb.doc/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.doc/configure +++ b/org.glite.lb.doc/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.glite-LB/configure b/org.glite.lb.glite-LB/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.glite-LB/configure +++ b/org.glite.lb.glite-LB/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.harvester/configure b/org.glite.lb.harvester/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.harvester/configure +++ b/org.glite.lb.harvester/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.logger-msg/configure b/org.glite.lb.logger-msg/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.logger-msg/configure +++ b/org.glite.lb.logger-msg/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.logger/configure +++ b/org.glite.lb.logger/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.server/configure +++ b/org.glite.lb.server/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.state-machine/configure b/org.glite.lb.state-machine/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.state-machine/configure +++ b/org.glite.lb.state-machine/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.types/configure b/org.glite.lb.types/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.types/configure +++ b/org.glite.lb.types/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.utils/configure b/org.glite.lb.utils/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.utils/configure +++ b/org.glite.lb.utils/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.ws-interface/configure b/org.glite.lb.ws-interface/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.ws-interface/configure +++ b/org.glite.lb.ws-interface/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.ws-test/configure b/org.glite.lb.ws-test/configure index 0279f57..67f58dc 100755 --- a/org.glite.lb.ws-test/configure +++ b/org.glite.lb.ws-test/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.lb.yaim/configure b/org.glite.lb.yaim/configure index 0279f57..67f58dc 100644 --- a/org.glite.lb.yaim/configure +++ b/org.glite.lb.yaim/configure @@ -31,6 +31,7 @@ my $stagedir = undef; my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -193,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -223,7 +225,9 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; @@ -705,6 +709,7 @@ prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -909,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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} --project=\${projectName} --module $subsys.$module @copts"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.px.glite-PX/configure b/org.glite.px.glite-PX/configure index 6c9dbc4..67f58dc 100755 --- a/org.glite.px.glite-PX/configure +++ b/org.glite.px.glite-PX/configure @@ -27,10 +27,11 @@ use Getopt::Long; my $pwd = `pwd`; chomp $pwd; my $prefix = '/usr'; -my $stagedir = $pwd.'/stage'; -my $root = ''; +my $stagedir = undef; +my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -47,9 +48,10 @@ my $jp_tag = ''; my $jobid_tag = ''; my $libdir = getlibdir(); my $projectname; +my $project = ''; -my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; +my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester glite-LB glite-PX/; my %enable_nodes; my %disable_nodes; @@ -179,7 +181,7 @@ my %lbmodules = ( my @opts = ( - 'prefix=s' => \$prefix, + 'prefix:s' => \$prefix, 'staged=s' => \$staged, 'module=s' => \$module, 'thrflavour:s' => \$thrflavour, @@ -192,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -200,6 +203,7 @@ my @opts = ( 'help' => \$help, 'libdir=s' => \$libdir, 'emi' => \$emi, + 'project=s' => \$project, ); for (@nodes) { @@ -221,11 +225,14 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; -$projectname = $emi ? 'emi' : 'org.glite'; +if (!$project) { $project = $emi ? 'emi' : 'glite'; } +$projectname = ($project eq 'emi') ? 'emi' : 'org.glite'; if ($emi) { for $_ (keys %etics_externs_emi) { $etics_externs{$_} = $etics_externs_emi{$_}; @@ -293,7 +300,7 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ; for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; } -$stagedir = $root.$prefix unless $stagedir; +$stagedir = $root unless $stagedir; if ($mode eq 'build') { print "Writing config.status\n"; @@ -382,7 +389,7 @@ sub mode_build { my $full = full($_); my $build = $buildroot{$_}; - print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install DESTDIR=$stagedir\n\n"; + print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n"; } close MAK; @@ -696,11 +703,13 @@ px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config print "Creating $full/$buildroot{$_}/Makefile.inc\n"; - print MKINC qq{PREFIX = $root + print MKINC qq{project = $project +PREFIX = $root prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -905,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.px.myproxy-yaim/configure b/org.glite.px.myproxy-yaim/configure index 6c9dbc4..67f58dc 100755 --- a/org.glite.px.myproxy-yaim/configure +++ b/org.glite.px.myproxy-yaim/configure @@ -27,10 +27,11 @@ use Getopt::Long; my $pwd = `pwd`; chomp $pwd; my $prefix = '/usr'; -my $stagedir = $pwd.'/stage'; -my $root = ''; +my $stagedir = undef; +my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -47,9 +48,10 @@ my $jp_tag = ''; my $jobid_tag = ''; my $libdir = getlibdir(); my $projectname; +my $project = ''; -my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; +my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester glite-LB glite-PX/; my %enable_nodes; my %disable_nodes; @@ -179,7 +181,7 @@ my %lbmodules = ( my @opts = ( - 'prefix=s' => \$prefix, + 'prefix:s' => \$prefix, 'staged=s' => \$staged, 'module=s' => \$module, 'thrflavour:s' => \$thrflavour, @@ -192,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -200,6 +203,7 @@ my @opts = ( 'help' => \$help, 'libdir=s' => \$libdir, 'emi' => \$emi, + 'project=s' => \$project, ); for (@nodes) { @@ -221,11 +225,14 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; -$projectname = $emi ? 'emi' : 'org.glite'; +if (!$project) { $project = $emi ? 'emi' : 'glite'; } +$projectname = ($project eq 'emi') ? 'emi' : 'org.glite'; if ($emi) { for $_ (keys %etics_externs_emi) { $etics_externs{$_} = $etics_externs_emi{$_}; @@ -293,7 +300,7 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ; for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; } -$stagedir = $root.$prefix unless $stagedir; +$stagedir = $root unless $stagedir; if ($mode eq 'build') { print "Writing config.status\n"; @@ -382,7 +389,7 @@ sub mode_build { my $full = full($_); my $build = $buildroot{$_}; - print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install DESTDIR=$stagedir\n\n"; + print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n"; } close MAK; @@ -696,11 +703,13 @@ px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config print "Creating $full/$buildroot{$_}/Makefile.inc\n"; - print MKINC qq{PREFIX = $root + print MKINC qq{project = $project +PREFIX = $root prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -905,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; diff --git a/org.glite.px.proxyrenewal/configure b/org.glite.px.proxyrenewal/configure index 6c9dbc4..67f58dc 100755 --- a/org.glite.px.proxyrenewal/configure +++ b/org.glite.px.proxyrenewal/configure @@ -27,10 +27,11 @@ use Getopt::Long; my $pwd = `pwd`; chomp $pwd; my $prefix = '/usr'; -my $stagedir = $pwd.'/stage'; -my $root = ''; +my $stagedir = undef; +my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; +my $localstatedir; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -47,9 +48,10 @@ my $jp_tag = ''; my $jobid_tag = ''; my $libdir = getlibdir(); my $projectname; +my $project = ''; -my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; +my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester glite-LB glite-PX/; my %enable_nodes; my %disable_nodes; @@ -179,7 +181,7 @@ my %lbmodules = ( my @opts = ( - 'prefix=s' => \$prefix, + 'prefix:s' => \$prefix, 'staged=s' => \$staged, 'module=s' => \$module, 'thrflavour:s' => \$thrflavour, @@ -192,7 +194,8 @@ my @opts = ( 'stage=s' => \$stagedir, 'root:s' => \$root, 'sysroot:s' => \$sysroot, - 'sysconfdir:s' => \$sysconfdir, + 'sysconfdir=s' => \$sysconfdir, + 'localstatedir=s' => \$localstatedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -200,6 +203,7 @@ my @opts = ( 'help' => \$help, 'libdir=s' => \$libdir, 'emi' => \$emi, + 'project=s' => \$project, ); for (@nodes) { @@ -221,11 +225,14 @@ $stage=~s/\/$//; $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } +if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; +$localstatedir=~s/\/$//; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; -$projectname = $emi ? 'emi' : 'org.glite'; +if (!$project) { $project = $emi ? 'emi' : 'glite'; } +$projectname = ($project eq 'emi') ? 'emi' : 'org.glite'; if ($emi) { for $_ (keys %etics_externs_emi) { $etics_externs{$_} = $etics_externs_emi{$_}; @@ -293,7 +300,7 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ; for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; } -$stagedir = $root.$prefix unless $stagedir; +$stagedir = $root unless $stagedir; if ($mode eq 'build') { print "Writing config.status\n"; @@ -382,7 +389,7 @@ sub mode_build { my $full = full($_); my $build = $buildroot{$_}; - print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install DESTDIR=$stagedir\n\n"; + print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n"; } close MAK; @@ -696,11 +703,13 @@ px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config print "Creating $full/$buildroot{$_}/Makefile.inc\n"; - print MKINC qq{PREFIX = $root + print MKINC qq{project = $project +PREFIX = $root prefix = $prefix stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir +localstatedir = $localstatedir thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -905,16 +914,13 @@ sub mode_etics { } } elsif ($subsys eq 'px' and $module eq 'myproxy-config') { - $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --root=\${prefix} --prefix= --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; - my $localprefix = $emi ? '/usr' : ''; - my $sysconfdir = ' --sysconfdir=/etc'; - # exception for yaims in EMI for now: prefix /opt/glite - 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"; + my $local_prefix = $emi ? '/usr' : ''; + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=$local_prefix --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts"; $cmd{compile} = 'make'; $cmd{test} = 'make check'; $cmd{install} = 'make install'; -- 1.8.2.3