From d806988c37dcdc3e7b5cf161fdff63920961695c Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Sun, 24 Aug 2008 19:32:13 +0000
Subject: Fixup grc data installation. Trunk now passes distcheck again.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9398 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/data/Makefile.am                     |  2 +-
 grc/data/grc/Makefile.am                 | 10 +++++++---
 grc/data/grc_gnuradio/Makefile.am        | 11 ++++++++---
 grc/data/grc_gnuradio/blocks/Makefile.am | 10 +++++++---
 4 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'grc/data')

diff --git a/grc/data/Makefile.am b/grc/data/Makefile.am
index 2b0c18e8c..7174279ba 100644
--- a/grc/data/Makefile.am
+++ b/grc/data/Makefile.am
@@ -19,6 +19,6 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = grc grc_gnuradio
diff --git a/grc/data/grc/Makefile.am b/grc/data/grc/Makefile.am
index 54ffda91b..f95d17c39 100644
--- a/grc/data/grc/Makefile.am
+++ b/grc/data/grc/Makefile.am
@@ -19,13 +19,17 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_data_dir)
+ourdatadir = $(grc_data_dir)
 
-EXTRA_DIST = \
+DATA_FILES = \
 	block_tree.dtd \
 	flow_graph.dtd \
 	grc-icon-256.png \
 	grc-icon-256.svg \
 	grc-icon-32.png
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
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)
-- 
cgit