From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Mon, 25 Jan 2010 22:57:02 +0000 (+0000)
Subject: Tweak version handling to allow vendor-specific suffixes without patching.
X-Git-Tag: v2.31-rc1~98^2~13^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9594ee92a095a5f27beed66c2c10fb910ad2dbd;p=thirdparty%2Futil-linux.git

Tweak version handling to allow vendor-specific suffixes without patching.

This overrides the "git describe" suffix for when the packaging is in git.
---

diff --git a/Makefile b/Makefile
index 2c5fd9e814..8d6c700be9 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS))
 version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) rfkill.h Makefile \
 		$(wildcard .git/index .git/refs/tags)
 	@$(NQ) ' GEN ' $@
+ifeq (,$(VERSION_SUFFIX))
 	$(Q)./version.sh $@
+else
+	$(Q)./version.sh --suffix "$(VERSION_SUFFIX)" $@
+endif
 
 %.o: %.c rfkill.h
 	@$(NQ) ' CC  ' $@
diff --git a/version.sh b/version.sh
index 957684b8f8..28b579a0ba 100755
--- a/version.sh
+++ b/version.sh
@@ -1,9 +1,18 @@
 #!/bin/sh
 
 VERSION="0.3"
+
+SUFFIX=
+if test "x$1" = x--suffix; then
+	shift
+	SUFFIX="-$1"
+	shift
+fi
 OUT="$1"
 
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+if test "x$SUFFIX" != 'x'; then
+	v="$VERSION$SUFFIX"
+elif head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	git update-index --refresh --unmerged > /dev/null
 	descr=$(git describe 2>/dev/null || echo "v$VERSION")