buildsys: improve resolving version

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index a16cbdbfae98f23f88904a7cdf4a53e07aad6d6f..249c5d27d2097667a38be0e7716d93e0a03b1c1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,6 @@ PACKAGE=spiceterm
 GITVERSION:=$(shell cat .git/refs/heads/master)
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-export VERSION=$(DEB_VERSION_UPSTREAM)
-
 DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
 DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc

diff --git a/debian/rules b/debian/rules
index 2d0b075f808917e3d8db79211034f7756d9b407a..9776800202aac0f0a89ab9db4f724269ad7ad476 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/pkg-info.mk
+export VERSION = $(or $(DEB_VERSION_UPSTREAM), unknown)
+
 %:
        dh $@ 
 

diff --git a/src/Makefile b/src/Makefile
index 2621df02b089c9933b83d73b3d5a0ccd9369ac67..a6adac17df29964b2aa76f386ddcd671eb0bc328 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
 PROGRAMS=spiceterm
+VERSION ?= $(or $(shell git rev-parse --short HEAD), unknown)
 
 HEADERS=translations.h event_loop.h glyphs.h spiceterm.h keysyms.h
 SOURCES=screen.c event_loop.c input.c spiceterm.c auth-pve.c