From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 20 Dec 2014 11:36:11 +0000 (+0100)
Subject: build: Avoid git warning when building from tarball.
X-Git-Tag: v0.5.4~2^2~1
X-Git-Url: https://git.tue.mpg.de/?a=commitdiff_plain;h=5a6f27f6d4ce24c75df2f702a24b3a5f50ddc6aa;p=paraslash.git

build: Avoid git warning when building from tarball.

The "git describe" command which is removed by this commit caused the
following warning when running "make" on a tree without .git directory
(extracted tarball or gitweb snapshot):

	fatal: Not a git repository (or any of the parent directories): .git

This commit avoids the warning. Of course "make tarball" still fails
in this case, but this is expected.
---

diff --git a/Makefile.real b/Makefile.real
index fb99679a..440220ce 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