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

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index df7ed327cb3f9b8f93ec596e629da4c08346e69a..b8abff355e071af95ae8fc7aafd575e131495438 100755 (executable)
--- 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 217d1a3ce8fa1f922343048f058a453f5fddd56f..6c7b38f2a1de7880b09d6bcce5ad65283dea8dff 100644 (file)
--- 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