Merged r9481:9518 on jblum/grc_reorganize into trunk. Reorganized grc source under...

[debian/gnuradio] / grc / Makefile.inc

diff --git a/grc/Makefile.inc b/grc/Makefile.inc
index ce18b69110f3215195bb8f51395b598cb5193ce4..8acd4e1075d75030a4b7f27c1754f86c5180a1ff 100644 (file)
--- a/grc/Makefile.inc
+++ b/grc/Makefile.inc
@@ -20,9 +20,10 @@
 #
 
 include $(top_srcdir)/Makefile.common
-
-grc_data_prefix = @datadir@/${PACKAGE}/grc
-grc_examples_prefix = @datadir@/${PACKAGE}/examples/grc
-grc_data_dir = $(grc_data_prefix)/grc
-grc_gnuradio_data_dir = $(grc_data_prefix)/grc_gnuradio
-grc_gnuradio_blocks_dir = $(grc_data_prefix)/grc_gnuradio/blocks
+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