Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gr-qtgui / Makefile.am

diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am
index 11238a40f6570551eaa09c5c54493c4d69e17a6b..d53f96c1f35b6d210208af6c4ab36be0d55c8775 100644 (file)
--- a/gr-qtgui/Makefile.am
+++ b/gr-qtgui/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2008 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,
@@ -21,8 +21,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = gr-qtgui.conf
 SUBDIRS = src
-
-etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-qtgui.conf
+DIST_SUBDIRS = src