diff options
| author | jcorgan | 2009-02-26 23:39:17 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-26 23:39:17 +0000 |
| commit | 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f (patch) | |
| tree | a3312f065b8865c473d2151f70a8d6ee1992563d /gr-sounder/src | |
| parent | f1c079534256ec7e1cd2bbf1360bec15c539d87c (diff) | |
| download | gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.tar.gz gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.tar.bz2 gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.zip | |
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
Diffstat (limited to 'gr-sounder/src')
| -rw-r--r-- | gr-sounder/src/fpga/top/Makefile.am | 31 | ||||
| -rw-r--r-- | gr-sounder/src/python/Makefile.am | 5 |
2 files changed, 10 insertions, 26 deletions
diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am index 8fc3d70f5..33e8c860d 100644 --- a/gr-sounder/src/fpga/top/Makefile.am +++ b/gr-sounder/src/fpga/top/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,9 +21,13 @@ include $(top_srcdir)/Makefile.common -datadir = $(prefix)/share/usrp +RBFS = usrp_sounder.rbf -RBFS = usrp_sounder.rbf +rbf2datadir = $(prefix)/share/usrp/rev2 +dist_rbf2data_DATA = $(RBFS) + +rbf4datadir = $(prefix)/share/usrp/rev4 +dist_rbf4data_DATA = $(RBFS) EXTRA_DIST = \ config.vh \ @@ -31,25 +35,7 @@ EXTRA_DIST = \ usrp_sounder.csf \ usrp_sounder.esf \ usrp_sounder.psf \ - usrp_sounder.qpf \ - $(RBFS) - - -install-data-local: - @for file in $(RBFS); do \ - echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file"; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file; \ - echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file"; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file; \ - done - -uninstall-local: - @for file in $(RBFS); do \ - echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \ - $(RM) $(DESTDIR)$(datadir)/rev2/$$file; \ - echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \ - $(RM) $(DESTDIR)$(datadir)/rev4/$$file; \ - done + usrp_sounder.qpf MOSTLYCLEANFILES = \ db/* \ @@ -61,4 +47,3 @@ MOSTLYCLEANFILES = \ *.pin \ *.sof \ *~ - diff --git a/gr-sounder/src/python/Makefile.am b/gr-sounder/src/python/Makefile.am index cf1b5efbe..cec948473 100644 --- a/gr-sounder/src/python/Makefile.am +++ b/gr-sounder/src/python/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -29,12 +29,11 @@ ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) EXTRA_DIST = \ - usrp_sounder.py \ sounder_loopback.sh \ qa_nothing.py \ run_tests.in -bin_SCRIPTS = \ +dist_bin_SCRIPTS = \ usrp_sounder.py ourpython_PYTHON = \ |