projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wip/term' of git@gnuradio.org:jcorgan
[debian/gnuradio]
/
config
/
gr_version.m4
diff --git
a/config/gr_version.m4
b/config/gr_version.m4
index 4f45f0efa348a3ff68aaa4034ab7bb1a9f52d758..3360b7d54d4372754e4226e5db86ab75784b5cfc 100644
(file)
--- a/
config/gr_version.m4
+++ b/
config/gr_version.m4
@@
-40,6
+40,7
@@
AC_DEFUN([GR_VERSION],[
if test "$MINOR_VERSION" == "git"; then
dnl 3.3git-xxx-gxxxxxxxx
RELEASE=$RELEASE$MINOR_VERSION
if test "$MINOR_VERSION" == "git"; then
dnl 3.3git-xxx-gxxxxxxxx
RELEASE=$RELEASE$MINOR_VERSION
+ DOCVER=$RELEASE
if test "$GIT_VERSION" != "" ; then
RELEASE=$RELEASE-$GIT_VERSION
fi
if test "$GIT_VERSION" != "" ; then
RELEASE=$RELEASE-$GIT_VERSION
fi
@@
-47,6
+48,7
@@
AC_DEFUN([GR_VERSION],[
if test "$MAINT_VERSION" == "git" ; then
dnl 3.3.1git-xxx-gxxxxxxxx
RELEASE=$RELEASE.$MINOR_VERSION$MAINT_VERSION
if test "$MAINT_VERSION" == "git" ; then
dnl 3.3.1git-xxx-gxxxxxxxx
RELEASE=$RELEASE.$MINOR_VERSION$MAINT_VERSION
+ DOCVER=$RELEASE
if test "$GIT_VERSION" != "" ; then
RELEASE=$RELEASE-$GIT_VERSION
fi
if test "$GIT_VERSION" != "" ; then
RELEASE=$RELEASE-$GIT_VERSION
fi
@@
-61,9
+63,12
@@
AC_DEFUN([GR_VERSION],[
dnl 3.3.0.1, 3.3.1.1
RELEASE=$RELEASE.$MAINT_VERSION
fi
dnl 3.3.0.1, 3.3.1.1
RELEASE=$RELEASE.$MAINT_VERSION
fi
+ DOCVER=$RELEASE
fi
fi
fi
AC_MSG_NOTICE([GNU Radio Release $RELEASE])
fi
fi
fi
AC_MSG_NOTICE([GNU Radio Release $RELEASE])
+ AC_SUBST(RELEASE)
+ AC_SUBST(DOCVER)
])
])