Skip to content
Snippets Groups Projects
Commit f44bde23 authored by Luca Bruno's avatar Luca Bruno Committed by Spencer Oliver
Browse files

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: default avatarLuca Bruno <lucab@debian.org>
Signed-off-by: default avatarSpencer Oliver <ntfreak@users.sourceforge.net>
parent 0ea76bc7
No related branches found
No related tags found
No related merge requests found
...@@ -45,10 +45,11 @@ libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" ...@@ -45,10 +45,11 @@ libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
# guess-rev.sh returns either a repository version ID or "-snapshot" # guess-rev.sh returns either a repository version ID or "-snapshot"
if RELEASE if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"\" libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
else else
libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\" libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
endif
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\" libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
endif
# add default CPPFLAGS # add default CPPFLAGS
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment