From: Lev Stipakov <lev@openvpn.net>
Date: Wed, 13 Oct 2021 23:02:27 +0000 (+0300)
Subject: msvc: fix product version display
X-Git-Tag: v2.5.5~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a9bf5d77451571b8d4ba83f5a80f5e16f9174b;p=thirdparty%2Fopenvpn.git

msvc: fix product version display

PRODUCT_VERSION_PATCH, defined in version.m4, already includes dot (like
".4"),
so no need to include it here.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20211013230227.199-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22931.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 23143667ff3368694191a57fea29b41d25c4b135)
---

diff --git a/config-msvc-version.h.in b/config-msvc-version.h.in
index 7977cb84e..59ca654ab 100644
--- a/config-msvc-version.h.in
+++ b/config-msvc-version.h.in
@@ -5,8 +5,8 @@
 #define PRODUCT_VERSION_MAJOR "@PRODUCT_VERSION_MAJOR@"
 #define PRODUCT_VERSION_MINOR "@PRODUCT_VERSION_MINOR@"
 #define PRODUCT_VERSION_PATCH "@PRODUCT_VERSION_PATCH@"
-#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@"
-#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@"
+#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@"
+#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@"
 #define PRODUCT_BUGREPORT "@PRODUCT_BUGREPORT@"
 #define OPENVPN_VERSION_RESOURCE @PRODUCT_VERSION_RESOURCE@
 #define TAP_WIN_COMPONENT_ID "@PRODUCT_TAP_WIN_COMPONENT_ID@"