96 files changed, 228 insertions, 94 deletions

diff --git a/gnuradio-examples/grc/CMakeLists.txt b/gnuradio-examples/grc/CMakeLists.txt
index 75f10d86a..680172cfa 100644
--- a/gnuradio-examples/grc/CMakeLists.txt
+++ b/gnuradio-examples/grc/CMakeLists.txt
@@ -17,15 +17,6 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-# AUDIO
-install(
-    FILES
-    audio/cvsd_sweep.grc
-    audio/dial_tone.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/audio
-    COMPONENT "gnuadio-examples"
-)
-
 # DEMOD
 install(
     FILES
@@ -33,7 +24,7 @@ install(
     demod/mpsk_demod.grc
     demod/pam_sync.grc
     demod/pam_timing.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/demod
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/demod
     COMPONENT "gnuadio-examples"
 )
 
@@ -43,34 +34,7 @@ install(
     simple/ber_simulation.grc
     simple/dpsk_loopback.grc
     simple/variable_config.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/simple
-    COMPONENT "gnuadio-examples"
-)
-
-# TRELLIS
-install(
-    FILES
-    trellis/interference_cancellation.grc
-    trellis/pccc1.grc
-    trellis/pccc.grc
-    trellis/sccc1.grc
-    trellis/sccc.grc
-    trellis/readme.txt
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/trellis
-    COMPONENT "gnuadio-examples"
-)
-
-# UHD
-install(
-    FILES
-    uhd/uhd_const_wave.grc
-    uhd/uhd_dpsk_mod.grc
-    uhd/uhd_fft.grc
-    uhd/uhd_rx_dpsk.grc
-    uhd/uhd_two_tone_loopback.grc
-    uhd/uhd_tx_dpsk.grc
-    uhd/uhd_wbfm_receive.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/uhd
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/simple
     COMPONENT "gnuadio-examples"
 )
 
@@ -81,6 +45,6 @@ install(
     xmlrpc/xmlrpc_client.grc
     xmlrpc/xmlrpc_client_script.py
     xmlrpc/xmlrpc_server.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/xmlrpc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/xmlrpc
     COMPONENT "gnuadio-examples"
 )
diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt
index 7038b9b0f..f9975cf08 100644
--- a/gr-audio/CMakeLists.txt
+++ b/gr-audio/CMakeLists.txt
@@ -33,6 +33,8 @@ GR_REGISTER_COMPONENT("gr-audio" ENABLE_GR_AUDIO
 
 GR_SET_GLOBAL(GR_AUDIO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
+SET(GR_PKG_AUDIO_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/audio)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
@@ -65,6 +67,13 @@ CPACK_COMPONENT("audio_python"
     DEPENDS      "core_python;audio_runtime"
 )
 
+CPACK_COMPONENT("audio_examples"
+    GROUP        "Audio"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Example programs"
+    DEPENDS      "audio_runtime"
+)
+
 CPACK_COMPONENT("audio_swig"
     GROUP        "Audio"
     DISPLAY_NAME "SWIG"
@@ -77,12 +86,13 @@ CPACK_COMPONENT("audio_swig"
 ########################################################################
 add_subdirectory(include)
 add_subdirectory(lib)
-add_subdirectory(examples/c++)
 add_subdirectory(doc)
+add_subdirectory(examples/c++)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(grc)
     add_subdirectory(examples/python)
+    add_subdirectory(examples/grc)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt
index 38490cce8..28bbc52a5 100644
--- a/gr-audio/examples/c++/CMakeLists.txt
+++ b/gr-audio/examples/c++/CMakeLists.txt
@@ -21,3 +21,9 @@ include_directories(${GR_AUDIO_INCLUDE_DIRS})
 include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
 add_executable(dial_tone dial_tone.cc)
 target_link_libraries(dial_tone gnuradio-audio)
+
+INSTALL(TARGETS
+    dial_tone
+    DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR}
+    COMPONENT "audio_examples"
+)
diff --git a/gr-audio/examples/grc/CMakeLists.txt b/gr-audio/examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..179b42fcc
--- /dev/null
+++ b/gr-audio/examples/grc/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Copyright 2012 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(
+    FILES
+    cvsd_sweep.grc
+    dial_tone.grc
+    DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR}
+    COMPONENT "audio_python"
+)
+
diff --git a/gnuradio-examples/grc/audio/cvsd_sweep.grc b/gr-audio/examples/grc/cvsd_sweep.grc
index b645b747a..b645b747a 100644
--- a/gnuradio-examples/grc/audio/cvsd_sweep.grc
+++ b/gr-audio/examples/grc/cvsd_sweep.grc
diff --git a/gnuradio-examples/grc/audio/dial_tone.grc b/gr-audio/examples/grc/dial_tone.grc
index ac8cbef27..ac8cbef27 100644
--- a/gnuradio-examples/grc/audio/dial_tone.grc
+++ b/gr-audio/examples/grc/dial_tone.grc
diff --git a/gr-audio/examples/python/CMakeLists.txt b/gr-audio/examples/python/CMakeLists.txt
index 86ba86ac0..24e29e234 100644
--- a/gr-audio/examples/python/CMakeLists.txt
+++ b/gr-audio/examples/python/CMakeLists.txt
@@ -32,6 +32,6 @@ GR_PYTHON_INSTALL(PROGRAMS
     noise.py
     spectrum_inversion.py
     test_resampler.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/audio
+    DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR}
     COMPONENT "audio_python"
 )
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 099af0869..eb7ed67e1 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -39,6 +39,8 @@ GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/swig
 )
 
+SET(GR_PKG_DIGITAL_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/digital)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt
index 5c652fc83..12fca6009 100644
--- a/gr-digital/examples/CMakeLists.txt
+++ b/gr-digital/examples/CMakeLists.txt
@@ -26,7 +26,7 @@ GR_PYTHON_INSTALL(PROGRAMS
     run_length.py
     gen_whitener.py
     snr_estimators.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/digital
+    DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}
     COMPONENT "digital_python"
 )
 
@@ -41,7 +41,7 @@ GR_PYTHON_INSTALL(PROGRAMS
     narrowband/digital_bert_rx.py
     narrowband/digital_bert_tx.py
     narrowband/tunnel.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/digital/narrowband
+    DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/narrowband
     COMPONENT "digital_python"
 )
 
@@ -55,6 +55,6 @@ GR_PYTHON_INSTALL(PROGRAMS
     ofdm/transmit_path.py
     ofdm/tunnel.py
     ofdm/uhd_interface.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/digital/ofdm
+    DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm
     COMPONENT "digital_python"
 )
diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt
index e454c01fa..10dd8b8cd 100644
--- a/gr-fcd/CMakeLists.txt
+++ b/gr-fcd/CMakeLists.txt
@@ -51,6 +51,8 @@ GR_SET_GLOBAL(GR_FCD_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/include/fcd
 )
 
+SET(GR_PKG_FCD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fcd)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
@@ -83,6 +85,13 @@ CPACK_COMPONENT("fcd_python"
     DEPENDS      "core_python;fcd_runtime"
 )
 
+CPACK_COMPONENT("fcd_examples"
+    GROUP        "FCD"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Example programs"
+    DEPENDS      "fcd_runtime"
+)
+
 CPACK_COMPONENT("fcd_swig"
     GROUP        "FCD"
     DISPLAY_NAME "SWIG"
@@ -99,8 +108,9 @@ if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python)
     add_subdirectory(grc)
+    add_subdirectory(examples/grc)
 endif(ENABLE_PYTHON)
-add_subdirectory(examples)
+add_subdirectory(examples/c++)
 add_subdirectory(doc)
 
 ########################################################################
diff --git a/gr-fcd/examples/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt
index 477a6311b..05574f4a8 100644
--- a/gr-fcd/examples/CMakeLists.txt
+++ b/gr-fcd/examples/c++/CMakeLists.txt
@@ -26,16 +26,6 @@ target_link_libraries(fcd_nfm_rx gnuradio-fcd)
 
 INSTALL(TARGETS
     fcd_nfm_rx
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd
+    DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR}
     COMPONENT "fcd_examples"
 )
-
-if(ENABLE_PYTHON)
-  INSTALL(FILES
-    fcd_apt_rx.grc
-    fcd_fft_wx.grc
-    fcd_nfm_rx.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd
-    COMPONENT "fcd_examples"
-  )
-endif()
diff --git a/gr-fcd/examples/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc
index 97ef7cf19..97ef7cf19 100644
--- a/gr-fcd/examples/fcd_nfm_rx.cc
+++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc
diff --git a/gr-fcd/examples/grc/CMakeLists.txt b/gr-fcd/examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..e33fdf182
--- /dev/null
+++ b/gr-fcd/examples/grc/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright 2012 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+INSTALL(FILES
+  fcd_apt_rx.grc
+  fcd_fft_wx.grc
+  fcd_nfm_rx.grc
+  DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR}
+  COMPONENT "fcd_examples"
+)
\ No newline at end of file
diff --git a/gr-fcd/examples/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc
index c4d3e64d1..c4d3e64d1 100644
--- a/gr-fcd/examples/fcd_apt_rx.grc
+++ b/gr-fcd/examples/grc/fcd_apt_rx.grc
diff --git a/gr-fcd/examples/fcd_fft_wx.grc b/gr-fcd/examples/grc/fcd_fft_wx.grc
index c045bbfa2..c045bbfa2 100644
--- a/gr-fcd/examples/fcd_fft_wx.grc
+++ b/gr-fcd/examples/grc/fcd_fft_wx.grc
diff --git a/gr-fcd/examples/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc
index 9dac3fcb8..9dac3fcb8 100644
--- a/gr-fcd/examples/fcd_nfm_rx.grc
+++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt
index eeec1cc8c..fc10caff4 100644
--- a/gr-noaa/CMakeLists.txt
+++ b/gr-noaa/CMakeLists.txt
@@ -35,6 +35,8 @@ GR_SET_GLOBAL(GR_NOAA_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
 
+SET(GR_PKG_NOAA_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/noaa)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
diff --git a/gr-noaa/examples/CMakeLists.txt b/gr-noaa/examples/CMakeLists.txt
index 4e5fd83e3..6994148df 100644
--- a/gr-noaa/examples/CMakeLists.txt
+++ b/gr-noaa/examples/CMakeLists.txt
@@ -17,15 +17,13 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-include(GrPython)
-
-GR_PYTHON_INSTALL(
-    PROGRAMS
+INSTALL(
+    FILES
     hrpt_decode.grc
     hrpt_demod.grc
     file_rx_hrpt.grc
     usrp_rx_hrpt.grc
     usrp_rx_hrpt_nogui.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/noaa
+    DESTINATION ${GR_PKG_NOAA_EXAMPLES_DIR}
     COMPONENT "noaa_python"
 )
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index a8fead401..32bf5bfcb 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -57,6 +57,8 @@ GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
 
+SET(GR_PKG_QTGUI_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/qt-gui)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt
index 30fdc5e75..4622bec29 100644
--- a/gr-qtgui/examples/CMakeLists.txt
+++ b/gr-qtgui/examples/CMakeLists.txt
@@ -24,6 +24,6 @@ GR_PYTHON_INSTALL(PROGRAMS
   pyqt_example_f.py
   pyqt_time_c.py
   pyqt_time_f.py
-  DESTINATION ${GR_PKG_DATA_DIR}/examples/qt-gui
-  COMPONENT "gnuradio_examples"
+  DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR}
+  COMPONENT "qtgui_python"
 )
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
index dc077571c..4e0ddc4eb 100644
--- a/gr-trellis/CMakeLists.txt
+++ b/gr-trellis/CMakeLists.txt
@@ -37,6 +37,8 @@ GR_SET_GLOBAL(GR_TRELLIS_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lib
 )
 
+SET(GR_PKG_TRELLIS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/trellis)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
@@ -97,7 +99,8 @@ add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(grc)
     add_subdirectory(src/python)
-    add_subdirectory(src/examples)
+    add_subdirectory(src/examples/python)
+    add_subdirectory(src/examples/grc)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gr-trellis/src/examples/grc/CMakeLists.txt b/gr-trellis/src/examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..51197a9f4
--- /dev/null
+++ b/gr-trellis/src/examples/grc/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright 2012 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(
+    FILES
+    interference_cancellation.grc
+    pccc1.grc
+    pccc.grc
+    sccc1.grc
+    sccc.grc
+    readme.txt
+    DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}
+    COMPONENT "trellis-examples"
+)
diff --git a/gnuradio-examples/grc/trellis/interference_cancellation.grc b/gr-trellis/src/examples/grc/interference_cancellation.grc
index 7674b4bf1..7674b4bf1 100644
--- a/gnuradio-examples/grc/trellis/interference_cancellation.grc
+++ b/gr-trellis/src/examples/grc/interference_cancellation.grc
diff --git a/gnuradio-examples/grc/trellis/pccc.grc b/gr-trellis/src/examples/grc/pccc.grc
index c3111c321..c3111c321 100644
--- a/gnuradio-examples/grc/trellis/pccc.grc
+++ b/gr-trellis/src/examples/grc/pccc.grc
diff --git a/gnuradio-examples/grc/trellis/pccc1.grc b/gr-trellis/src/examples/grc/pccc1.grc
index 15a63707e..15a63707e 100644
--- a/gnuradio-examples/grc/trellis/pccc1.grc
+++ b/gr-trellis/src/examples/grc/pccc1.grc
diff --git a/gnuradio-examples/grc/trellis/readme.txt b/gr-trellis/src/examples/grc/readme.txt
index 9c7363af8..9c7363af8 100644
--- a/gnuradio-examples/grc/trellis/readme.txt
+++ b/gr-trellis/src/examples/grc/readme.txt
diff --git a/gnuradio-examples/grc/trellis/sccc.grc b/gr-trellis/src/examples/grc/sccc.grc
index e8f656f63..e8f656f63 100644
--- a/gnuradio-examples/grc/trellis/sccc.grc
+++ b/gr-trellis/src/examples/grc/sccc.grc
diff --git a/gnuradio-examples/grc/trellis/sccc1.grc b/gr-trellis/src/examples/grc/sccc1.grc
index 0be59d0c4..0be59d0c4 100644
--- a/gnuradio-examples/grc/trellis/sccc1.grc
+++ b/gr-trellis/src/examples/grc/sccc1.grc
diff --git a/gr-trellis/src/examples/CMakeLists.txt b/gr-trellis/src/examples/python/CMakeLists.txt
index 0d9589908..e2c7e70ff 100644
--- a/gr-trellis/src/examples/CMakeLists.txt
+++ b/gr-trellis/src/examples/python/CMakeLists.txt
@@ -33,7 +33,7 @@ GR_PYTHON_INSTALL(
     test_turbo_equalization.py
     test_turbo_equalization1.py
     test_turbo_equalization2.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis
+    DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}
     COMPONENT "trellis_examples"
 )
 
@@ -59,6 +59,6 @@ install(
     fsm_files/rep3.fsm
     fsm_files/rep5.fsm
     fsm_files/simple.fsm
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis/fsm_files
+    DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}/fsm_files
     COMPONENT "trellis_examples"
 )
diff --git a/gr-trellis/src/examples/README b/gr-trellis/src/examples/python/README
index bd28e3d61..bd28e3d61 100644
--- a/gr-trellis/src/examples/README
+++ b/gr-trellis/src/examples/python/README
diff --git a/gr-trellis/src/examples/fsm_files/awgn1o2_128.fsm b/gr-trellis/src/examples/python/fsm_files/awgn1o2_128.fsm
index bb79c59da..bb79c59da 100644
--- a/gr-trellis/src/examples/fsm_files/awgn1o2_128.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn1o2_128.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm b/gr-trellis/src/examples/python/fsm_files/awgn1o2_16.fsm
index cdab41359..cdab41359 100644
--- a/gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn1o2_16.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm b/gr-trellis/src/examples/python/fsm_files/awgn1o2_4.fsm
index fb316b5ef..fb316b5ef 100644
--- a/gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn1o2_4.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn1o2_8.fsm b/gr-trellis/src/examples/python/fsm_files/awgn1o2_8.fsm
index 604bac6c2..604bac6c2 100644
--- a/gr-trellis/src/examples/fsm_files/awgn1o2_8.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn1o2_8.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o3_16.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o3_16.fsm
index 9630cd9af..9630cd9af 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o3_16.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o3_16.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4.fsm
index 3ac57be18..3ac57be18 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o3_4_msb.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4_msb.fsm
index 551b71101..551b71101 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o3_4_msb.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4_msb.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o3_4_msbG.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4_msbG.fsm
index 8956c53da..8956c53da 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o3_4_msbG.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o3_4_msbG.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o3_8.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o3_8.fsm
index 34deeb68c..34deeb68c 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o3_8.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o3_8.fsm
diff --git a/gr-trellis/src/examples/fsm_files/awgn2o4_4.fsm b/gr-trellis/src/examples/python/fsm_files/awgn2o4_4.fsm
index a895be896..a895be896 100644
--- a/gr-trellis/src/examples/fsm_files/awgn2o4_4.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/awgn2o4_4.fsm
diff --git a/gr-trellis/src/examples/fsm_files/disconnected.fsm b/gr-trellis/src/examples/python/fsm_files/disconnected.fsm
index 847963e7b..847963e7b 100644
--- a/gr-trellis/src/examples/fsm_files/disconnected.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/disconnected.fsm
diff --git a/gr-trellis/src/examples/fsm_files/irregular.fsm b/gr-trellis/src/examples/python/fsm_files/irregular.fsm
index 80b82b889..80b82b889 100644
--- a/gr-trellis/src/examples/fsm_files/irregular.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/irregular.fsm
diff --git a/gr-trellis/src/examples/fsm_files/joint_16_16.fsm b/gr-trellis/src/examples/python/fsm_files/joint_16_16.fsm
index 3dae314b6..3dae314b6 100644
--- a/gr-trellis/src/examples/fsm_files/joint_16_16.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/joint_16_16.fsm
diff --git a/gr-trellis/src/examples/fsm_files/joint_4_16.fsm b/gr-trellis/src/examples/python/fsm_files/joint_4_16.fsm
index 8f2cdab81..8f2cdab81 100644
--- a/gr-trellis/src/examples/fsm_files/joint_4_16.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/joint_4_16.fsm
diff --git a/gr-trellis/src/examples/fsm_files/rep3.fsm b/gr-trellis/src/examples/python/fsm_files/rep3.fsm
index ef1bd1f02..ef1bd1f02 100644
--- a/gr-trellis/src/examples/fsm_files/rep3.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/rep3.fsm
diff --git a/gr-trellis/src/examples/fsm_files/rep5.fsm b/gr-trellis/src/examples/python/fsm_files/rep5.fsm
index 2aa5d77cf..2aa5d77cf 100644
--- a/gr-trellis/src/examples/fsm_files/rep5.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/rep5.fsm
diff --git a/gr-trellis/src/examples/fsm_files/simple.fsm b/gr-trellis/src/examples/python/fsm_files/simple.fsm
index f27f6b4b0..f27f6b4b0 100644
--- a/gr-trellis/src/examples/fsm_files/simple.fsm
+++ b/gr-trellis/src/examples/python/fsm_files/simple.fsm
diff --git a/gr-trellis/src/examples/fsm_utils.py b/gr-trellis/src/examples/python/fsm_utils.py
index e9243f899..e9243f899 100755
--- a/gr-trellis/src/examples/fsm_utils.py
+++ b/gr-trellis/src/examples/python/fsm_utils.py
diff --git a/gr-trellis/src/examples/test_cpm.py b/gr-trellis/src/examples/python/test_cpm.py
index 06d54b1a6..06d54b1a6 100755
--- a/gr-trellis/src/examples/test_cpm.py
+++ b/gr-trellis/src/examples/python/test_cpm.py
diff --git a/gr-trellis/src/examples/test_pccc_turbo1.py b/gr-trellis/src/examples/python/test_pccc_turbo1.py
index 7f1ea26ae..7f1ea26ae 100755
--- a/gr-trellis/src/examples/test_pccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_pccc_turbo1.py
diff --git a/gr-trellis/src/examples/test_sccc_hard.py b/gr-trellis/src/examples/python/test_sccc_hard.py
index e732ac2c0..e732ac2c0 100755
--- a/gr-trellis/src/examples/test_sccc_hard.py
+++ b/gr-trellis/src/examples/python/test_sccc_hard.py
diff --git a/gr-trellis/src/examples/test_sccc_soft.py b/gr-trellis/src/examples/python/test_sccc_soft.py
index 1c71e4ca7..1c71e4ca7 100755
--- a/gr-trellis/src/examples/test_sccc_soft.py
+++ b/gr-trellis/src/examples/python/test_sccc_soft.py
diff --git a/gr-trellis/src/examples/test_sccc_turbo.py b/gr-trellis/src/examples/python/test_sccc_turbo.py
index b1007a864..b1007a864 100755
--- a/gr-trellis/src/examples/test_sccc_turbo.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo.py
diff --git a/gr-trellis/src/examples/test_sccc_turbo1.py b/gr-trellis/src/examples/python/test_sccc_turbo1.py
index ad2ed6bf9..ad2ed6bf9 100755
--- a/gr-trellis/src/examples/test_sccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo1.py
diff --git a/gr-trellis/src/examples/test_sccc_turbo2.py b/gr-trellis/src/examples/python/test_sccc_turbo2.py
index fdb92adc8..fdb92adc8 100755
--- a/gr-trellis/src/examples/test_sccc_turbo2.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo2.py
diff --git a/gr-trellis/src/examples/test_tcm.py b/gr-trellis/src/examples/python/test_tcm.py
index 62fd5135e..62fd5135e 100755
--- a/gr-trellis/src/examples/test_tcm.py
+++ b/gr-trellis/src/examples/python/test_tcm.py
diff --git a/gr-trellis/src/examples/test_tcm_bit.py b/gr-trellis/src/examples/python/test_tcm_bit.py
index cc5caefbc..cc5caefbc 100755
--- a/gr-trellis/src/examples/test_tcm_bit.py
+++ b/gr-trellis/src/examples/python/test_tcm_bit.py
diff --git a/gr-trellis/src/examples/test_tcm_combined.py b/gr-trellis/src/examples/python/test_tcm_combined.py
index 55a3043b8..55a3043b8 100755
--- a/gr-trellis/src/examples/test_tcm_combined.py
+++ b/gr-trellis/src/examples/python/test_tcm_combined.py
diff --git a/gr-trellis/src/examples/test_tcm_parallel.py b/gr-trellis/src/examples/python/test_tcm_parallel.py
index 2b722c09e..2b722c09e 100755
--- a/gr-trellis/src/examples/test_tcm_parallel.py
+++ b/gr-trellis/src/examples/python/test_tcm_parallel.py
diff --git a/gr-trellis/src/examples/test_turbo_equalization.py b/gr-trellis/src/examples/python/test_turbo_equalization.py
index 6fa6749f0..6fa6749f0 100755
--- a/gr-trellis/src/examples/test_turbo_equalization.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization.py
diff --git a/gr-trellis/src/examples/test_turbo_equalization1.py b/gr-trellis/src/examples/python/test_turbo_equalization1.py
index 15a8f6809..15a8f6809 100755
--- a/gr-trellis/src/examples/test_turbo_equalization1.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization1.py
diff --git a/gr-trellis/src/examples/test_turbo_equalization2.py b/gr-trellis/src/examples/python/test_turbo_equalization2.py
index 7e4341cba..7e4341cba 100755
--- a/gr-trellis/src/examples/test_turbo_equalization2.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization2.py
diff --git a/gr-trellis/src/examples/test_viterbi_equalization.py b/gr-trellis/src/examples/python/test_viterbi_equalization.py
index d290a0d0a..d290a0d0a 100755
--- a/gr-trellis/src/examples/test_viterbi_equalization.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization.py
diff --git a/gr-trellis/src/examples/test_viterbi_equalization1.py b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
index 41f777551..41f777551 100755
--- a/gr-trellis/src/examples/test_viterbi_equalization1.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index 4f4503234..3ba4f5342 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -39,6 +39,8 @@ GR_SET_GLOBAL(GR_UHD_INCLUDE_DIRS
     ${UHD_INCLUDE_DIRS}
 )
 
+SET(GR_PKG_UHD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/uhd)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
@@ -71,6 +73,13 @@ CPACK_COMPONENT("uhd_python"
     DEPENDS      "core_python;uhd_runtime"
 )
 
+CPACK_COMPONENT("uhd_examples"
+    GROUP        "UHD"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Example programs"
+    DEPENDS      "uhd_runtime"
+)
+
 CPACK_COMPONENT("uhd_swig"
     GROUP        "UHD"
     DISPLAY_NAME "SWIG"
@@ -83,12 +92,14 @@ CPACK_COMPONENT("uhd_swig"
 ########################################################################
 add_subdirectory(include)
 add_subdirectory(lib)
-add_subdirectory(examples)
 add_subdirectory(doc)
+add_subdirectory(examples/c++)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(grc)
     add_subdirectory(apps)
+    add_subdirectory(examples/python)
+    add_subdirectory(examples/grc)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gr-uhd/examples/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt
index 91e2dfdaf..25645117c 100644
--- a/gr-uhd/examples/CMakeLists.txt
+++ b/gr-uhd/examples/c++/CMakeLists.txt
@@ -38,30 +38,8 @@ link_directories(${Boost_LIBRARY_DIRS})
 add_executable(tags_demo tags_demo.cc)
 target_link_libraries(tags_demo gnuradio-uhd)
 
-########################################################################
-# Python examples
-########################################################################
-if(ENABLE_PYTHON)
-GR_PYTHON_INSTALL(
-    PROGRAMS
-    fm_tx4.py
-    fm_tx_2_daughterboards.py
-    max_power.py
-    usrp_am_mw_rcv.py
-    usrp_nbfm_ptt.py
-    usrp_nbfm_rcv.py
-    usrp_spectrum_sense.py
-    usrp_tv_rcv_nogui.py
-    usrp_tv_rcv.py
-    usrp_wfm_rcv2_nogui.py
-    usrp_wfm_rcv_fmdet.py
-    usrp_wfm_rcv_nogui.py
-    usrp_wfm_rcv_pll.py
-    usrp_wfm_rcv.py
-    usrp_wfm_rcv_sca.py
-    usrp_wxapt_rcv.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/uhd
-    COMPONENT "uhd_python"
+INSTALL(TARGETS
+    tags_demo
+    DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
+    COMPONENT "uhd_examples"
 )
-
-endif(ENABLE_PYTHON)
diff --git a/gr-uhd/examples/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h
index 7d49bd971..7d49bd971 100644
--- a/gr-uhd/examples/tag_sink_demo.h
+++ b/gr-uhd/examples/c++/tag_sink_demo.h
diff --git a/gr-uhd/examples/tag_source_demo.h b/gr-uhd/examples/c++/tag_source_demo.h
index 9743c3407..9743c3407 100644
--- a/gr-uhd/examples/tag_source_demo.h
+++ b/gr-uhd/examples/c++/tag_source_demo.h
diff --git a/gr-uhd/examples/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc
index f7442f098..f7442f098 100644
--- a/gr-uhd/examples/tags_demo.cc
+++ b/gr-uhd/examples/c++/tags_demo.cc
diff --git a/gr-uhd/examples/grc/CMakeLists.txt b/gr-uhd/examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..06c233d45
--- /dev/null
+++ b/gr-uhd/examples/grc/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Copyright 2012 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(
+    FILES
+    uhd_const_wave.grc
+    uhd_dpsk_mod.grc
+    uhd_fft.grc
+    uhd_rx_dpsk.grc
+    uhd_two_tone_loopback.grc
+    uhd_tx_dpsk.grc
+    uhd_wbfm_receive.grc
+    DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
+    COMPONENT "uhd_python"
+)
diff --git a/gnuradio-examples/grc/uhd/uhd_const_wave.grc b/gr-uhd/examples/grc/uhd_const_wave.grc
index c64721c83..c64721c83 100644
--- a/gnuradio-examples/grc/uhd/uhd_const_wave.grc
+++ b/gr-uhd/examples/grc/uhd_const_wave.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_dpsk_mod.grc b/gr-uhd/examples/grc/uhd_dpsk_mod.grc
index 18ae9c3db..18ae9c3db 100644
--- a/gnuradio-examples/grc/uhd/uhd_dpsk_mod.grc
+++ b/gr-uhd/examples/grc/uhd_dpsk_mod.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_fft.grc b/gr-uhd/examples/grc/uhd_fft.grc
index 29c375065..29c375065 100644
--- a/gnuradio-examples/grc/uhd/uhd_fft.grc
+++ b/gr-uhd/examples/grc/uhd_fft.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_rx_dpsk.grc b/gr-uhd/examples/grc/uhd_rx_dpsk.grc
index 73848ff3c..73848ff3c 100644
--- a/gnuradio-examples/grc/uhd/uhd_rx_dpsk.grc
+++ b/gr-uhd/examples/grc/uhd_rx_dpsk.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_two_tone_loopback.grc b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
index 8bcbc0792..8bcbc0792 100644
--- a/gnuradio-examples/grc/uhd/uhd_two_tone_loopback.grc
+++ b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_tx_dpsk.grc b/gr-uhd/examples/grc/uhd_tx_dpsk.grc
index 281ba8429..281ba8429 100644
--- a/gnuradio-examples/grc/uhd/uhd_tx_dpsk.grc
+++ b/gr-uhd/examples/grc/uhd_tx_dpsk.grc
diff --git a/gnuradio-examples/grc/uhd/uhd_wbfm_receive.grc b/gr-uhd/examples/grc/uhd_wbfm_receive.grc
index 62658a2eb..62658a2eb 100644
--- a/gnuradio-examples/grc/uhd/uhd_wbfm_receive.grc
+++ b/gr-uhd/examples/grc/uhd_wbfm_receive.grc
diff --git a/gr-uhd/examples/python/CMakeLists.txt b/gr-uhd/examples/python/CMakeLists.txt
new file mode 100644
index 000000000..7642b536b
--- /dev/null
+++ b/gr-uhd/examples/python/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Copyright 2011 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    fm_tx4.py
+    fm_tx_2_daughterboards.py
+    max_power.py
+    usrp_am_mw_rcv.py
+    usrp_nbfm_ptt.py
+    usrp_nbfm_rcv.py
+    usrp_spectrum_sense.py
+    usrp_tv_rcv_nogui.py
+    usrp_tv_rcv.py
+    usrp_wfm_rcv2_nogui.py
+    usrp_wfm_rcv_fmdet.py
+    usrp_wfm_rcv_nogui.py
+    usrp_wfm_rcv_pll.py
+    usrp_wfm_rcv.py
+    usrp_wfm_rcv_sca.py
+    usrp_wxapt_rcv.py
+    DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
+    COMPONENT "uhd_python"
+)
diff --git a/gr-uhd/examples/fm_tx4.py b/gr-uhd/examples/python/fm_tx4.py
index aecb35b54..aecb35b54 100755
--- a/gr-uhd/examples/fm_tx4.py
+++ b/gr-uhd/examples/python/fm_tx4.py
diff --git a/gr-uhd/examples/fm_tx_2_daughterboards.py b/gr-uhd/examples/python/fm_tx_2_daughterboards.py
index c0a7112de..c0a7112de 100755
--- a/gr-uhd/examples/fm_tx_2_daughterboards.py
+++ b/gr-uhd/examples/python/fm_tx_2_daughterboards.py
diff --git a/gr-uhd/examples/max_power.py b/gr-uhd/examples/python/max_power.py
index a849432ee..a849432ee 100755
--- a/gr-uhd/examples/max_power.py
+++ b/gr-uhd/examples/python/max_power.py
diff --git a/gr-uhd/examples/usrp_am_mw_rcv.py b/gr-uhd/examples/python/usrp_am_mw_rcv.py
index 85ffd7632..85ffd7632 100755
--- a/gr-uhd/examples/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/python/usrp_am_mw_rcv.py
diff --git a/gr-uhd/examples/usrp_nbfm_ptt.py b/gr-uhd/examples/python/usrp_nbfm_ptt.py
index 075604af3..075604af3 100755
--- a/gr-uhd/examples/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/python/usrp_nbfm_ptt.py
diff --git a/gr-uhd/examples/usrp_nbfm_rcv.py b/gr-uhd/examples/python/usrp_nbfm_rcv.py
index 6fdf95a30..6fdf95a30 100755
--- a/gr-uhd/examples/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_nbfm_rcv.py
diff --git a/gr-uhd/examples/usrp_spectrum_sense.py b/gr-uhd/examples/python/usrp_spectrum_sense.py
index 355a55a98..355a55a98 100755
--- a/gr-uhd/examples/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/python/usrp_spectrum_sense.py
diff --git a/gr-uhd/examples/usrp_tv_rcv.py b/gr-uhd/examples/python/usrp_tv_rcv.py
index 700915bf8..700915bf8 100755
--- a/gr-uhd/examples/usrp_tv_rcv.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv.py
diff --git a/gr-uhd/examples/usrp_tv_rcv_nogui.py b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
index 870e65b27..870e65b27 100755
--- a/gr-uhd/examples/usrp_tv_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv.py b/gr-uhd/examples/python/usrp_wfm_rcv.py
index f6c5cf853..f6c5cf853 100755
--- a/gr-uhd/examples/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv2_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
index b70334f30..b70334f30 100755
--- a/gr-uhd/examples/usrp_wfm_rcv2_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
index 9649857c0..9649857c0 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
index f0195bcb5..f0195bcb5 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv_pll.py b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
index b0744b00b..b0744b00b 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_pll.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
diff --git a/gr-uhd/examples/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
index 224f30cf8..224f30cf8 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
diff --git a/gr-uhd/examples/usrp_wxapt_rcv.py b/gr-uhd/examples/python/usrp_wxapt_rcv.py
index d9b1a0188..d9b1a0188 100755
--- a/gr-uhd/examples/usrp_wxapt_rcv.py
+++ b/gr-uhd/examples/python/usrp_wxapt_rcv.py
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index e800cff00..19f0dbec9 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -35,6 +35,8 @@ GR_SET_GLOBAL(GR_VOCODER_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
+SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/vocoder)
+
 ########################################################################
 # Begin conditional configuration
 ########################################################################
diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt
index 76a757826..769ddf602 100644
--- a/gr-vocoder/examples/CMakeLists.txt
+++ b/gr-vocoder/examples/CMakeLists.txt
@@ -32,6 +32,6 @@ GR_PYTHON_INSTALL(
     g723_40_audio_loopback.py
     gsm_audio_loopback.py
     ulaw_audio_loopback.py
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/vocoder
+    DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR}
     COMPONENT "vocoder_examples"
 )