From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 16 Dec 2011 16:15:04 +0000 (+0000)
Subject: Changing age properly in branched configurations with the new packaging.
X-Git-Tag: emi-canl-c_R_1_0_0_0~116
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8eef66795c5f6cf9af31aec5f2068846d1be65e2;p=jra1mw.git

Changing age properly in branched configurations with the new packaging.
---

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}";