From c3c22d18622f19504027e5ce683fcaedf5a9c268 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 12 Feb 2013 20:53:36 +0100 Subject: [PATCH] configure: only match tags starting with a digit for version number --- Makefile.am | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 11a68e5e..16870f81 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ dist-hook: $(distdir)/ChangeLog __force-changelog-generation: $(distdir)/ChangeLog: __force-changelog-generation $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \ - prev=$$(git describe --tags --always --match [0-9]* 2> /dev/null) ; \ + prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \ for tag in $$(git tag | grep -E '^[0-9]+(\.[0-9]+){1,}$$' | sort -rn); do \ if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \ if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \ diff --git a/configure.ac b/configure.ac index 96e856f8..319afaa6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ dnl Use something like this if you need to patch autoconf files and dnl regenerate configure outside upstream git tree: dnl AC_INIT([lldpd], [0.5.7], [bernat@luffy.cx]) AC_INIT([lldpd], - [m4_esyscmd_s([git describe --tags --always 2> /dev/null || date +%F])], + [m4_esyscmd_s([git describe --tags --always --match [0-9]* 2> /dev/null || date +%F])], [bernat@luffy.cx]) AC_CONFIG_SRCDIR([src/log.c]) -- 2.39.5