Rewrite the makefile + gen-version.sh

The old files were simply broken, hopefully the new ones will work out
somewhat better.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 file changed, 20 insertions, 4 deletions

diff --git a/gen-version.sh b/gen-version.shindex 4c60f607..739c83e9 100755--- a/gen-version.sh+++ b/gen-version.sh@@ -1,4 +1,20 @@-v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g')-test -z "$v" && exit 1-echo "CGIT_VERSION = $v"-echo "CGIT_VERSION = $v" > VERSION+#!/bin/sh++# Get version-info specified in Makefile+V=$1++# Use `git describe` to get current version if we're inside a git repo+if test -d .git+then+	V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')+fi++new="CGIT_VERSION = $V"+old=$(cat VERSION 2>/dev/null)++# Exit if VERSION is uptodate+test "$old" = "$new" && exit 0++# Update VERSION with new version-info+echo "$new" > VERSION+cat VERSION
diff --git a/gen-version.sh b/gen-version.sh
index 4c60f607..739c83e9 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -1,4 +1,20 @@
-v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g')
-test -z "$v" && exit 1
-echo "CGIT_VERSION = $v"
-echo "CGIT_VERSION = $v" > VERSION
+#!/bin/sh
+
+# Get version-info specified in Makefile
+V=$1
+
+# Use `git describe` to get current version if we're inside a git repo
+if test -d .git
+then
+	V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')
+fi
+
+new="CGIT_VERSION = $V"
+old=$(cat VERSION 2>/dev/null)
+
+# Exit if VERSION is uptodate
+test "$old" = "$new" && exit 0
+
+# Update VERSION with new version-info
+echo "$new" > VERSION
+cat VERSION