Change calculation of docdir to remove trailer when in git development

diff --git a/Makefile.common b/Makefile.common
index e36b49e8e7fd59ba641a7873b0120e83916c3d58..aca56b34aeac948d2a9757a878d7a780f54931fa 100644 (file)
--- 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 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
+    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 1c01e43fad450dd21e0e7269e130ef69076573eb..6099ebb72818caca0348320299b244760456e243 100644 (file)
--- 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             \