Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/version.mak b/version.mak
index 617a547..8d03eb7 100644
--- a/version.mak
+++ b/version.mak
@@ -1 +1,15 @@
-export PJ_VERSION := 2.0-beta-svn
+export PJ_VERSION_MAJOR  := 2
+export PJ_VERSION_MINOR  := 0
+export PJ_VERSION_REV    :=
+export PJ_VERSION_SUFFIX := beta-svn
+
+export PJ_VERSION := $(PJ_VERSION_MAJOR).$(PJ_VERSION_MINOR)
+
+ifneq ($(PJ_VERSION_REV),)
+export PJ_VERSION := $(PJ_VERSION).$(PJ_VERSION_REV)
+endif
+
+ifneq ($(PJ_VERSION_SUFFIX),)
+export PJ_VERSION := $(PJ_VERSION)-$(PJ_VERSION_SUFFIX)
+endif
+