diff options
| author | Ben Reynwar | 2011-01-30 09:50:36 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2011-01-30 09:50:36 -0700 |
| commit | d1d4c8fd9dcf852cef9c274363182209c6761145 (patch) | |
| tree | 54ddbd617c5ffffbbfc4e766f2d2281669919a73 /grc/Makefile.am | |
| parent | f6547e103e6cae44ff2a81b0f83675ccc897f2e9 (diff) | |
| parent | 023167ca8a85ab597f9e59302733f71809a8afbd (diff) | |
| download | gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.tar.gz gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.tar.bz2 gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.zip | |
Merged upstream from next
Diffstat (limited to 'grc/Makefile.am')
| -rw-r--r-- | grc/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/grc/Makefile.am b/grc/Makefile.am index 2b5dc730b..330777bb7 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,9 +41,9 @@ ourpython_PYTHON = __init__.py etcdir = $(gr_prefsdir) dist_etc_DATA = grc.conf -EXTRA_DIST = $(srcdir)/grc.conf.in +EXTRA_DIST += $(srcdir)/grc.conf.in -BUILT_SOURCES = grc.conf +BUILT_SOURCES += grc.conf grc.conf: $(srcdir)/grc.conf.in Makefile sed \ |