On 9 July 2011 22:44, Luca Bruno <lu...@debian.org> wrote:
> 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 <lu...@debian.org>
> ---
>  src/Makefile.am |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 1e7af9c..1be24ea 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)
> --
> 1.7.5.4
>

looks good to me

Cheers
Spen
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to