Merge branch 'wip/burx_support'

[debian/gnuradio] / gnuradio-core / Makefile.am

diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index b4b619b8b754b8337ee61a5428d92503e3b32db3..107ff785b1fa47035e2b8965559d95edcd16c1d0 100644 (file)
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2001,2006 Free Software Foundation, Inc.
+# Copyright 2001,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -15,22 +15,19 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST =                           \
-       gnuradio-core.conf              \
-       gnuradio-core.pc.in             \
-       README.hacking                  \
-       README-win32-mingw-short.txt
+       gnuradio-core.pc.in
 
-SUBDIRS = src doc
+SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-core.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gnuradio-core.conf
+etcdir = $(gr_prefsdir)
+dist_etc_DATA = gnuradio-core.conf