diff options
| author | Johnathan Corgan | 2010-05-12 14:37:43 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-12 14:37:43 -0700 |
| commit | 83a28558176a4e6ebcf8f38aef0739659b0a7c1b (patch) | |
| tree | 4b2dd624ea96d1d69df9463a1c66a504beff13b3 /config/gr_version.m4 | |
| parent | 39cb5b8daee27ccca4d1919706910ccff116f45d (diff) | |
| download | gnuradio-83a28558176a4e6ebcf8f38aef0739659b0a7c1b.tar.gz gnuradio-83a28558176a4e6ebcf8f38aef0739659b0a7c1b.tar.bz2 gnuradio-83a28558176a4e6ebcf8f38aef0739659b0a7c1b.zip | |
Change version numbering to always include minor release
Diffstat (limited to 'config/gr_version.m4')
| -rw-r--r-- | config/gr_version.m4 | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/config/gr_version.m4 b/config/gr_version.m4 index 3360b7d54..489f78034 100644 --- a/config/gr_version.m4 +++ b/config/gr_version.m4 @@ -25,7 +25,7 @@ AC_DEFUN([GR_VERSION],[ dnl dnl MAJOR_VERSION Major release generation (2.x, 3.x, etc.) dnl API_COMPAT API compatibility version (3.2.x, 3.3.x, etc.) - dnl MINOR_VERSION Minor release version + dnl MINOR_VERSION Minor release version (3.3.0, 3.3.1, etc.) dnl MAINT_VERSION Pure bugfix additions to make maintenance release dnl dnl The last two fields can have 'git' instead of a number to indicate @@ -53,18 +53,13 @@ AC_DEFUN([GR_VERSION],[ RELEASE=$RELEASE-$GIT_VERSION fi else - dnl This is a numbered reelase. - dnl Test if minor version is 0, which we don't encode, unless it is also - dnl a maintenance release - if test "$MINOR_VERSION" != "0" -o "$MAINT_VERSION" != "0"; then - dnl 3.3.1 - RELEASE=$RELEASE.$MINOR_VERSION - if test "$MAINT_VERSION" != "0"; then - dnl 3.3.0.1, 3.3.1.1 - RELEASE=$RELEASE.$MAINT_VERSION - fi - DOCVER=$RELEASE + dnl This is a numbered release. + RELEASE=$RELEASE.$MINOR_VERSION + if test "$MAINT_VERSION" != "0"; then + RELEASE=$RELEASE.$MAINT_VERSION fi + + DOCVER=$RELEASE fi fi |