diff options
author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /version.mak | |
parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'version.mak')
-rw-r--r-- | version.mak | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/version.mak b/version.mak index 617a547d..8d03eb76 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 + |