diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-10-13 13:07:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-10-13 13:07:19 -0700 |
| commit | 6b0bbd512a12a1ec0309f0f8d38797c824ec1326 (patch) | |
| tree | 9423401658916683107180e277437c0d7d5471a2 | |
| parent | 068c84168c35858197b18835ade10c8cebc180ae (diff) | |
Change calculation of docdir to remove trailer when in git development
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | config/gr_version.m4 | 5 | ||||
| -rw-r--r-- | usrp/doc/Makefile.am | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index e36b49e8e7..aca56b34ae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -108,7 +108,7 @@ exampledir = $(datadir)/gnuradio/examples # Base directory for documentation (docdir undefined in autoconf < 1.60) docdir ?= $(datadir)/doc/$(PACKAGE) -gr_docdir = $(docdir)-$(VERSION) +gr_docdir = $(docdir)-$(DOCVER) # System configuration files gr_prefsdir = $(GR_PREFSDIR) diff --git a/config/gr_version.m4 b/config/gr_version.m4 index 4f45f0efa3..3360b7d54d 100644 --- 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 + DOCVER=$RELEASE 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 + DOCVER=$RELEASE 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 + DOCVER=$RELEASE fi fi fi AC_MSG_NOTICE([GNU Radio Release $RELEASE]) + AC_SUBST(RELEASE) + AC_SUBST(DOCVER) ]) diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am index 1c01e43fad..6099ebb728 100644 --- a/usrp/doc/Makefile.am +++ b/usrp/doc/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = other man3dir = $(mandir)/man3 -usrp_docdir = $(prefix)/share/doc/usrp-@VERSION@ +usrp_docdir = $(prefix)/share/doc/usrp-$(DOCVER) EXTRA_DIST = \ Doxyfile.in \ |