From 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Thu, 26 Feb 2009 23:39:17 +0000
Subject: Merged r10504:10528 from michaelld/fix_local_data_install into trunk.
  Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gnuradio-examples/python/apps/hf_explorer/Makefile.am | 13 +++++++------
 gnuradio-examples/python/apps/hf_radio/Makefile.am    | 17 +++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'gnuradio-examples/python/apps')

diff --git a/gnuradio-examples/python/apps/hf_explorer/Makefile.am b/gnuradio-examples/python/apps/hf_explorer/Makefile.am
index deb6c32d8..88ad52128 100644
--- a/gnuradio-examples/python/apps/hf_explorer/Makefile.am
+++ b/gnuradio-examples/python/apps/hf_explorer/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,10 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = 	\
-    README 	\
-    hfx2.py 	\
+ourdatadir = $(exampledir)/hf_explorer
+
+dist_ourdata_DATA =	\
+    README		\
     hfx_help
 
-ourdatadir = $(exampledir)/hf_explorer
-ourdata_DATA = $(EXTRA_DIST)
\ No newline at end of file
+dist_ourdata_SCRIPTS = 	\
+    hfx2.py
diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.am b/gnuradio-examples/python/apps/hf_radio/Makefile.am
index a6a4dfe3d..70b516d5d 100644
--- a/gnuradio-examples/python/apps/hf_radio/Makefile.am
+++ b/gnuradio-examples/python/apps/hf_radio/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,18 +21,19 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = 	\
+ourdatadir = $(exampledir)/hf_radio
+
+dist_ourdata_DATA = 	\
     hfir.sci	\
+    radio.xml	\
+    README.TXT	\
+    ssb_taps
+
+dist_ourdata_SCRIPTS = 	\
     input.py	\
     output.py	\
     radio.py	\
-    radio.xml	\
-    README.TXT	\
     ssbagc.py	\
     ssbdemod.py \
-    ssb_taps	\
     startup.py	\
     ui.py
-
-ourdatadir = $(exampledir)/hf_radio
-ourdata_DATA = $(EXTRA_DIST)
-- 
cgit