From 06ba81b4f1acb371f7cbc2e351f6769a7d2627db Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 14 Jul 2016 12:32:48 -0700 Subject: Build 2.1.1, second try. The buildbots that create packages run `perl make-version.pl --set-release` at the beginning of each build. This in turn sets the extra version information for our generated packages to "-g" for development builds, or "" (an empty string) for release builds. Hardcoding the extra version information to "-git" in CMakeLists.txt and configure.ac means we end up with wireshark-2.1.0-git.tar.bz2, Wireshark-win64-2.1.0-git.exe, etc. for release builds. Set them back to empty strings. Change-Id: Icdfb248d25ad4adbc9abe0bd938e410590e42828 Reviewed-on: https://code.wireshark.org/review/16439 Reviewed-by: Gerald Combs --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index caa29a32a6..f194e94477 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ m4_define([version_major], [2]) m4_define([version_minor], [1]) m4_define([version_micro], [1]) dnl Updated by make-version.pl -m4_define([version_extra], [-git]) +m4_define([version_extra], []) m4_define([version_micro_extra], m4_join([], version_micro, version_extra)) AC_INIT(Wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/) -- cgit v1.2.1