X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=72fa41ac385698342ab0f28c71418e615e029600;hb=a8d895c1315a02001b6bd6f393232fa07aa810ea;hp=04ed4baede5399d4f99d1be44899aa7a2ace4066;hpb=25ba0fdec627f472689c9f93a254e666b5d4317d;p=sfa.git

diff --git a/Makefile b/Makefile
index 04ed4bae..72fa41ac 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,13 @@ uninstall: python-uninstall tests-uninstall
 
 .PHONY: all install clean uninstall
 
-VERSIONTAG=0.0-0-should.be-redefined-by-specfile
+##########
+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)
 SCMURL=should-be-redefined-by-specfile
 
-##########
 python: version
 
 version: sfa/util/version.py
@@ -125,7 +128,7 @@ sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiL
 sfiListSlivers.py sfadump.py
 
 BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
-	./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
+	./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
 	$(foreach client,$(CLIENTS),./sfa/client/$(client))
 
 sync: