From: Luca Bruno <lucab@debian.org>
Date: Sat, 9 Jul 2011 21:44:39 +0000 (+0200)
Subject: Do not append git info to version string when building from released tarball
X-Git-Tag: v0.5.0~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f44bde23b9cf6b3868c712b20cf7d11bdb605482;p=openocd

Do not append git info to version string when building from released tarball

When building official releases from tarball, git commit info is not
available in the building environment. Thus, automake should not try to
append the git commit to the version string.

Signed-off-by: Luca Bruno <lucab@debian.org>
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e7af9c7..1be24ea2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,10 +45,11 @@ libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 # guess-rev.sh returns either a repository version ID or "-snapshot"
 if RELEASE
 libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
+libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
 else
 libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-endif
 libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+endif
 
 # add default CPPFLAGS
 libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)