From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 26 Mar 2021 16:29:54 +0000 (+0000)
Subject: Fix up NSIS ProductVersion for RPM version strings
X-Git-Tag: v8.20~347^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2cf6514db33cf57c0135fe0ae96e7a71142f7619;p=users%2Fdwmw2%2Fopenconnect.git

Fix up NSIS ProductVersion for RPM version strings

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/Makefile.am b/Makefile.am
index e8f06a10..6a222875 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,7 +293,7 @@ uninstfiles.nsh: dll-list.txt
 # get it to work and life's too short.
 openconnect.nsi: version.c
 	VERSION=$$(cut -f2 -d\" version.c); \
-	PROD_VERSION=$$(echo "$$VERSION" | perl -ne 'm|v(\d+)\.(\d+)(?:\-(\d+)-g.+)|; print "$$1.$$2." . ($$3 or "0") . ".0"'); \
+	PROD_VERSION=$$(echo "$$VERSION" | perl -ne 'm|v(\d+)\.(\d+)(?:\.git\.\|\-)?(\d+)?(?:-g.+\|.*)|; print "$$1.$$2." . ($$3 or "0") . ".0"'); \
 	if egrep -q '^#define OPENCONNECT_GNUTLS' config.h; then \
 	    TLS_LIBRARY=GnuTLS; \
 	elif egrep -q '^#define OPENCONNECT_OPENSSL' config.h; then \