Merge branch 'usrp-eeprom' of git://gnuradio.org/jabele

[debian/gnuradio] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index e36b49e8e7fd59ba641a7873b0120e83916c3d58..64891345ba778b99600d6b7e2620b6beb9df2068 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -108,11 +108,14 @@ 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)
 
+# Data directory for grc block wrappers
+grc_blocksdir = $(pkgdatadir)/grc/blocks
+
 # Other common defines; use "+=" to add to these
 STAMPS =
 MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT