From 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
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
---
gr-gpio/src/fpga/rbf/Makefile.am | 9 +++------
gr-gpio/src/python/Makefile.am | 8 ++++----
2 files changed, 7 insertions(+), 10 deletions(-)
(limited to 'gr-gpio/src')
diff --git a/gr-gpio/src/fpga/rbf/Makefile.am b/gr-gpio/src/fpga/rbf/Makefile.am
index 0bc4311a15..e444d62eb6 100644
--- a/gr-gpio/src/fpga/rbf/Makefile.am
+++ b/gr-gpio/src/fpga/rbf/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -29,9 +29,6 @@ datadir = $(prefix)/share/usrp
datarev2dir = $(datadir)/rev2
datarev4dir = $(datadir)/rev4
-datarev2_DATA = $(RBFS)
+dist_datarev2_DATA = $(RBFS)
-datarev4_DATA = $(RBFS)
-
-EXTRA_DIST = \
- $(RBFS)
+dist_datarev4_DATA = $(RBFS)
diff --git a/gr-gpio/src/python/Makefile.am b/gr-gpio/src/python/Makefile.am
index ea1a986693..b61a408057 100644
--- a/gr-gpio/src/python/Makefile.am
+++ b/gr-gpio/src/python/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -31,7 +31,7 @@ ourpython_PYTHON = \
gpio.py
# List of python files that will be installed onto $prefix/bin
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
gpio_rx_sfile.py \
gpio_usrp_siggen.py \
gpio_usrp_fft.py
@@ -44,7 +44,7 @@ noinst_PYTHON = \
# Programs that get run by 'make check'
TESTS = run_tests
-# Files to go into tarball not otherwise mentioned (except bin_SCRIPTS!)
-EXTRA_DIST = run_tests.in $(bin_SCRIPTS)
+# Files to go into tarball not otherwise mentioned
+EXTRA_DIST = run_tests.in
MOSTLYCLEANFILES = *.pyo *.pyc *~
--
cgit v1.2.3