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
---
 gr-radar-mono/src/fpga/top/Makefile.am | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'gr-radar-mono/src/fpga/top')

diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gr-radar-mono/src/fpga/top/Makefile.am
index f964106c5..606aa6c44 100644
--- a/gr-radar-mono/src/fpga/top/Makefile.am
+++ b/gr-radar-mono/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,35 +21,21 @@
 
 include $(top_srcdir)/Makefile.common
 
-datadir = $(prefix)/share/usrp
-
 RBFS = usrp_radar_mono.rbf
 
+rbf2datadir = $(prefix)/share/usrp/rev2
+dist_rbf2data_DATA = $(RBFS)
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+dist_rbf4data_DATA = $(RBFS)
+
 EXTRA_DIST = \
 	usrp_radar_mono.csf \
 	usrp_radar_mono.esf \
 	usrp_radar_mono.psf \
 	usrp_radar_mono.qpf \
 	usrp_radar_mono.qsf \
-	usrp_radar_mono.v   \
-	$(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_radar_mono.v
 
 MOSTLYCLEANFILES = 	\
 	db/*		\
-- 
cgit