From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 2 May 2013 13:00:30 +0000 (+0200)
Subject: try to use sensible variable names all over
X-Git-Tag: sfa-2.1-26~15^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0df807aa9310e1e3518d3985e03540c8702078dd;p=sfa.git

try to use sensible variable names all over
---

diff --git a/Makefile b/Makefile
index e0936608..f0283372 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ uninstall: python-uninstall tests-uninstall
 .PHONY: all install clean uninstall
 
 ##########
-rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# in general overridden (set by the specfile); but can be called right away
+RPMVERSION:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
 # somehow %{taglevel} is empty, turns out %{release} has what we want
-rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
-VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
+RPMRELEASE:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
+VERSIONTAG=$(RPMVERSION)-$(RPMRELEASE)
 SCMURL=should-be-redefined-by-specfile
 
 python: version
diff --git a/sfa.spec b/sfa.spec
index 5677eb88..35a9410d 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -155,7 +155,7 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RPM_BUILD_ROOT"
+make RPMVERSION="%{version}" RPMRELEASE="%{taglevel}" SCMURL="%{SCMURL}" DESTDIR="$RPM_BUILD_ROOT" install 
 
 %clean
 rm -rf $RPM_BUILD_ROOT