From 8eef66795c5f6cf9af31aec5f2068846d1be65e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 16 Dec 2011 16:15:04 +0000 Subject: [PATCH] Changing age properly in branched configurations with the new packaging. --- org.glite.lb/configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 726c635..45b5c78 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -297,8 +297,8 @@ if ($listmodules) { exit 0; } -warn "$0: --version, --branch and --output make sense only in --mode=etics\n" - if ($version || $output || $branch) && $mode ne 'etics'; +warn "$0: --branch and --output make sense only in --mode=etics\n" + if ($output || $branch) && $mode ne 'etics'; my $en; for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; } @@ -1360,7 +1360,9 @@ sub mode_etics { $conf = "$confprefix${subsys}-${module}_$branch"; $conftag = $branch; # forced low age number - $age = $branch eq 'HEAD' ? '0head' : '0dev'; } + $age = $branch eq 'HEAD' ? '0head' : '0dev'; + push @copts, '--version ${version}-${age}'; + } else { $conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; -- 1.8.2.3