13 files changed, 12 insertions, 4 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index 554e9028fa..7f8015f9f4 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py
@@ -24,8 +24,8 @@ if path.endswith(path_ending):
     # We importing it from build directory.
     build_path = os.path.join(path[:-len(path_ending)])
 
-    # Place these directory on __path__ so that it's contents are part of the gnuradio
-    # package.
+    # Place these directories on __path__ so that their contents are
+    # part of the gnuradio package.
     __path__.append(os.path.join(build_path, 'gr-utils', 'src', 'python'))
     __path__.append(os.path.join(build_path, 'gr-blocks', 'python'))
     __path__.append(os.path.join(build_path, 'gr-digital', 'python'))
@@ -41,3 +41,4 @@ if path.endswith(path_ending):
     __path__.append(os.path.join(build_path, 'gr-noaa', 'python'))
     __path__.append(os.path.join(build_path, 'gr-pager', 'python'))
     __path__.append(os.path.join(build_path, 'gr-video-sdl', 'python'))
+    __path__.append(os.path.join(build_path, 'gr-vocoder', 'python'))
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index f8f7a20b46..a2fb108c35 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -96,7 +96,7 @@ add_subdirectory(lib)
 add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
-    add_subdirectory(python)
+    add_subdirectory(python/vocoder)
     add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt
index 9fdc625280..9fdc625280 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/vocoder/CMakeLists.txt
diff --git a/gr-vocoder/python/__init__.py b/gr-vocoder/python/vocoder/__init__.py
index ba5862f8d9..7b1b82f847 100644
--- a/gr-vocoder/python/__init__.py
+++ b/gr-vocoder/python/vocoder/__init__.py
@@ -23,6 +23,13 @@
 This is the gr-vocoder package. This package includes the various
 vocoder blocks in GNU Radio.
 '''
+import os
+
+try:
+    from vocoder_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from vocoder_swig import *
 
-from vocoder_swig import *
 from cvsd import *
diff --git a/gr-vocoder/python/cvsd.py b/gr-vocoder/python/vocoder/cvsd.py
index 1c58c33076..1c58c33076 100644
--- a/gr-vocoder/python/cvsd.py
+++ b/gr-vocoder/python/vocoder/cvsd.py
diff --git a/gr-vocoder/python/qa_alaw_vocoder.py b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
index a8d65409e5..a8d65409e5 100755
--- a/gr-vocoder/python/qa_alaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
diff --git a/gr-vocoder/python/qa_codec2_vocoder.py b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
index 7f38904459..7f38904459 100755
--- a/gr-vocoder/python/qa_codec2_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
diff --git a/gr-vocoder/python/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
index 42cb7f19b9..42cb7f19b9 100755
--- a/gr-vocoder/python/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
diff --git a/gr-vocoder/python/qa_g721_vocoder.py b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
index e6ac04e155..e6ac04e155 100755
--- a/gr-vocoder/python/qa_g721_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
diff --git a/gr-vocoder/python/qa_g723_24_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
index eda9ed86bd..eda9ed86bd 100755
--- a/gr-vocoder/python/qa_g723_24_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
diff --git a/gr-vocoder/python/qa_g723_40_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
index db6b7538f3..db6b7538f3 100755
--- a/gr-vocoder/python/qa_g723_40_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
diff --git a/gr-vocoder/python/qa_gsm_full_rate.py b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
index 4a7692ecd4..4a7692ecd4 100755
--- a/gr-vocoder/python/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
diff --git a/gr-vocoder/python/qa_ulaw_vocoder.py b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
index a87aae762c..a87aae762c 100755
--- a/gr-vocoder/python/qa_ulaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py