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 e8f06a1062c0ced3a385e850b611c5e2c6181c9e..6a222875fd16a81e84d23aef0a9e93e78529eb48 100644 (file)
--- 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 \