From: Andre Noll <maan@systemlinux.org>
Date: Fri, 23 Jan 2015 12:17:10 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/tarball-build-fix'
X-Git-Tag: v0.5.4~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=56d75bd90d78cf44cd3984ce2a45627ef5646d38;hp=f167629b3191c57a6b691cd2a6af04a45a74ccb0

Merge branch 'refs/heads/t/tarball-build-fix'
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index df7ed327..b8abff35 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -8,7 +8,7 @@ LF='
 '
 
 # First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
+# then try git-describe, then gitweb, then default.
 if [[ -f VERSION ]]; then
 	VN=$(cat VERSION) || VN="$DEF_VER"
 elif [[ -d .git || -f .git ]] &&
@@ -22,6 +22,8 @@ elif [[ -d .git || -f .git ]] &&
 	esac
 then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif [[ "$PWD" =~ paraslash-[a-f0-9]{1,} ]]; then
+	VN="${PWD#*-}"
 else
 	VN="$DEF_VER"
 fi
diff --git a/Makefile.real b/Makefile.real
index 217d1a3c..6c7b38f2 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -51,7 +51,7 @@ play_objs := $(addprefix $(object_dir)/, $(play_objs))
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := $(PACKAGE_TARNAME)-$(shell git describe --dirty)
+tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2