summaryrefslogtreecommitdiff
path: root/grc/data/grc_gnuradio
diff options
context:
space:
mode:
Diffstat (limited to 'grc/data/grc_gnuradio')
-rw-r--r--grc/data/grc_gnuradio/Makefile.am11
-rw-r--r--grc/data/grc_gnuradio/blocks/Makefile.am10
2 files changed, 15 insertions, 6 deletions
diff --git a/grc/data/grc_gnuradio/Makefile.am b/grc/data/grc_gnuradio/Makefile.am
index 1f64722f5..c0e98960b 100644
--- a/grc/data/grc_gnuradio/Makefile.am
+++ b/grc/data/grc_gnuradio/Makefile.am
@@ -19,14 +19,19 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
SUBDIRS = blocks
-datadir = $(grc_gnuradio_data_dir)
+ourdatadir = $(grc_gnuradio_data_dir)
-EXTRA_DIST = \
+DATA_FILES = \
block.dtd \
block_tree.xml \
default_flow_graph.grc.xml \
flow_graph.tmpl
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
+
diff --git a/grc/data/grc_gnuradio/blocks/Makefile.am b/grc/data/grc_gnuradio/blocks/Makefile.am
index 9906a313f..877ed9801 100644
--- a/grc/data/grc_gnuradio/blocks/Makefile.am
+++ b/grc/data/grc_gnuradio/blocks/Makefile.am
@@ -19,11 +19,11 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
-datadir = $(grc_gnuradio_blocks_dir)
+ourdatadir = $(grc_gnuradio_blocks_dir)
-EXTRA_DIST = \
+DATA_FILES = \
audio_sink.xml \
audio_source.xml \
band_pass_filter.xml \
@@ -204,3 +204,7 @@ EXTRA_DIST = \
wxgui_waterfallsink2.xml \
xmlrpc_client.xml \
xmlrpc_server.xml
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)