Fixup grc data installation. Trunk now passes distcheck again.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9398 221aa14e-8319-0410-a670-987f0aec2ac5

5 files changed, 30 insertions, 14 deletions

diff --git a/grc/examples/Makefile.am b/grc/examples/Makefile.am
index 9bba14bc9..2c06367c0 100644
--- a/grc/examples/Makefile.am
+++ b/grc/examples/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = \
 	audio \
diff --git a/grc/examples/audio/Makefile.am b/grc/examples/audio/Makefile.am
index 78800edcc..b3282479f 100644
--- a/grc/examples/audio/Makefile.am
+++ b/grc/examples/audio/Makefile.am
@@ -19,8 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/audio
+ourdatadir = $(grc_examples_prefix)/audio
 
-EXTRA_DIST = dial_tone.grc
+DATA_FILES = dial_tone.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
diff --git a/grc/examples/simple/Makefile.am b/grc/examples/simple/Makefile.am
index a2fcd614e..b9d1b8d56 100644
--- a/grc/examples/simple/Makefile.am
+++ b/grc/examples/simple/Makefile.am
@@ -19,8 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/simple
+ourdatadir = $(grc_examples_prefix)/simple
 
-EXTRA_DIST = ber_simulation.grc
+DATA_FILES = ber_simulation.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
diff --git a/grc/examples/usrp/Makefile.am b/grc/examples/usrp/Makefile.am
index 9ad96c915..45cc3b74d 100644
--- a/grc/examples/usrp/Makefile.am
+++ b/grc/examples/usrp/Makefile.am
@@ -19,10 +19,14 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/usrp
+ourdatadir = $(grc_examples_prefix)/usrp
 
-EXTRA_DIST = \
+DATA_FILES = \
 	usrp_two_tone_loopback.grc \
 	usrp_wbfm_receive.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
diff --git a/grc/examples/xmlrpc/Makefile.am b/grc/examples/xmlrpc/Makefile.am
index 68ecbdd9b..6f75e41b8 100644
--- a/grc/examples/xmlrpc/Makefile.am
+++ b/grc/examples/xmlrpc/Makefile.am
@@ -19,12 +19,16 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/xmlrpc
+ourdatadir = $(grc_examples_prefix)/xmlrpc
 
-EXTRA_DIST = \
+DATA_FILES = \
 	readme.txt \
 	xmlrpc_client.grc \
-	xmlrpc_client_script.py\ 
+	xmlrpc_client_script.py\
 	xmlrpc_server.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)