aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-11-25 09:41:37 +0000
committerJoão Valverde <j@v6e.pt>2016-12-16 16:23:51 +0000
commit41a9a1f9bf44c5b92eff49fecd57194ff2dc116c (patch)
tree48393b46625805a7eee4bdfaddcecb6bf953c129
parent8a0e86301b39039912a44cacbc786a0c2f041d29 (diff)
autotools: Add tag glob pattern for distribution VCS version
Avoid leaking private tags and prefer vX.X.X over wireshark-X.X.X. Ping-Bug: 12901 Change-Id: I7a4e2de283b87047e435a0b0abe72bc18819a985 Reviewed-on: https://code.wireshark.org/review/18951 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index f64828faac..2f186f273f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1206,5 +1206,5 @@ gen-authors:
cd $(top_srcdir) && $(PERL) tools/generate_authors.pl AUTHORS.src > AUTHORS
dist-hook:
- printf "git_description=%s\n" "$$(git -C $(top_srcdir) describe)" \
+ printf "git_description=%s\n" "$$(git -C $(top_srcdir) describe --match 'v[1-9]*')" \
> $(top_distdir)/version.conf