Imported Upstream version 3.2.2

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

diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index 91537dfa475f429544b9a25536c3e299180fc232..d5447c17a44e2aef905a4a18a25bb956df3eadba 100644 (file)
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2006 Free Software Foundation, Inc.
+# Copyright 2001,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,13 +22,12 @@
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST =                           \
-       gnuradio-core.conf              \
        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_sysconfdir)
+dist_etc_DATA = gnuradio-core.conf