Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / grc / Makefile.inc

diff --git a/grc/Makefile.inc b/grc/Makefile.inc
index 8acd4e1075d75030a4b7f27c1754f86c5180a1ff..96ee11b67e721d44581a5c1d296ae6f287ca497c 100644 (file)
--- a/grc/Makefile.inc
+++ b/grc/Makefile.inc
@@ -20,10 +20,5 @@
 #
 
 include $(top_srcdir)/Makefile.common
-grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
 grc_src_prefix = $(pythondir)/gnuradio/grc
-grc_data_prefix = $(datadir)/$(PACKAGE)/grc
-grc_examples_prefix = $(exampledir)/grc
-grc_base_data_dir = $(grc_data_prefix)/platforms/base
-grc_python_data_dir = $(grc_data_prefix)/platforms/python
-grc_python_blocks_dir = $(grc_data_prefix)/platforms/python/blocks
+grc_blocksdir = $(pkgdatadir)/grc/blocks