7 files changed, 30 insertions, 6 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 4ee888281..15086be0f 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -84,7 +84,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	gnuradio-core/src/guile/Makefile \
 	gnuradio-core/src/guile/run_guile_tests \
 	gnuradio-core/src/guile/gr-run-waveform-script \
-	gnuradio-core/src/guile/example-waveforms/Makefile \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
         gnuradio-core/src/lib/g72x/Makefile \
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 4d6116c70..0aad0c0da 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -43,6 +43,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
    	gnuradio-examples/python/pfb/Makefile \
    	gnuradio-examples/python/usrp/Makefile \
 	gnuradio-examples/python/usrp2/Makefile \
+	gnuradio-examples/waveforms/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gnuradio-examples)
diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index 9ea890c12..e0c1b1d15 100644
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -25,3 +25,6 @@ SUBDIRS = c++
 if PYTHON
 SUBDIRS += python grc
 endif
+if GUILE
+SUBDIRS += waveforms
+endif
diff --git a/gnuradio-core/src/guile/example-waveforms/.gitignore b/gnuradio-examples/waveforms/.gitignore
index 16c984055..16c984055 100644
--- a/gnuradio-core/src/guile/example-waveforms/.gitignore
+++ b/gnuradio-examples/waveforms/.gitignore
diff --git a/gnuradio-core/src/guile/example-waveforms/Makefile.am b/gnuradio-examples/waveforms/Makefile.am
index 277b4ad0b..c07020a5c 100644
--- a/gnuradio-core/src/guile/example-waveforms/Makefile.am
+++ b/gnuradio-examples/waveforms/Makefile.am
@@ -19,10 +19,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-waveformdir=$(datarootdir)/gnuradio/example-waveforms
+ourdatadir = $(exampledir)/waveforms
 
-waveform_DATA = \
-	dial-tone.wfd
-
-EXTRA_DIST += \
+dist_ourdata_DATA = \
+	README \
 	dial-tone.wfd
diff --git a/gnuradio-examples/waveforms/README b/gnuradio-examples/waveforms/README
new file mode 100644
index 000000000..1f109ef53
--- /dev/null
+++ b/gnuradio-examples/waveforms/README
@@ -0,0 +1,23 @@
+#
+# Copyright 2010 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 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+FIXME explain this stuff :-)
+
+This directory contains example "Waveform Description Files" that are
+designed to be loaded and run using the gr-run-waveform command.
diff --git a/gnuradio-core/src/guile/example-waveforms/dial-tone.wfd b/gnuradio-examples/waveforms/dial-tone.wfd
index ced3df572..ced3df572 100644
--- a/gnuradio-core/src/guile/example-waveforms/dial-tone.wfd
+++ b/gnuradio-examples/waveforms/dial-tone.wfd