From a6579fcc2a3eacf4e85e63f7ff88d591d934fbb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Wed, 27 May 2015 12:28:11 +0200 Subject: [PATCH] Fix incorrectly generated POEDIT_VERSION_WIN --- scripts/chversion.sh | 5 ++++- src/version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/chversion.sh b/scripts/chversion.sh index 7a13f4bcd3..ea29f389ab 100755 --- a/scripts/chversion.sh +++ b/scripts/chversion.sh @@ -18,7 +18,10 @@ replace_ver() VER_FULL=$1 VER_SHORT="`echo $VER_FULL | sed -e 's/\(pre\|beta\|rc\)[0-9]//g'`" -VER_WIN="`echo $VER_SHORT | tr '.' ','`,0" +VER_WIN="`echo $VER_SHORT | tr '.' ','`" +if [ `echo $VER_WIN | awk 'BEGIN{FS=","} {print NF}'` = 2 ] ; then + VER_WIN="$VER_WIN,0" +fi replace_ver win32/poedit.iss \ '\(#define VERSION_FULL *"\).*\("\)' "\1$VER_FULL\2" diff --git a/src/version.h b/src/version.h index 66b328220f..75956e0391 100644 --- a/src/version.h +++ b/src/version.h @@ -27,6 +27,6 @@ #define _VERSION_H_ #define POEDIT_VERSION "1.8.1" -#define POEDIT_VERSION_WIN 1,8,1,0 +#define POEDIT_VERSION_WIN 1,8,1 #endif // _VERSION_H_