6 files changed, 20 insertions, 13 deletions
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index 04c7e2c504..d699b06ef6 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -94,7 +94,7 @@ CPACK_COMPONENT("pager_swig"
 add_subdirectory(include/gnuradio/pager)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
-    add_subdirectory(python)
+    add_subdirectory(python/pager)
     add_subdirectory(swig)
     add_subdirectory(grc)
     add_subdirectory(apps)
diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/pager/CMakeLists.txt
index 30ac0364d7..c93573c2ad 100644
--- a/gr-pager/python/CMakeLists.txt
+++ b/gr-pager/python/pager/CMakeLists.txt
@@ -34,16 +34,17 @@ GR_PYTHON_INSTALL(
 ########################################################################
 if(ENABLE_TESTING)
 
-list(APPEND GR_TEST_PYTHON_DIRS
-    ${CMAKE_BINARY_DIR}/gr-pager/python
-    ${CMAKE_BINARY_DIR}/gr-pager/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-pager)
+  set(GR_TEST_TARGET_DEPS "")
+  set(GR_TEST_LIBRARY_DIRS "")
+  set(GR_TEST_PYTHON_DIRS
+    ${CMAKE_BINARY_DIR}/gruel/src/python
+    ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+    )
 
-include(GrTest)
-file(GLOB py_qa_test_files "qa_*.py")
-foreach(py_qa_test_file ${py_qa_test_files})
+  include(GrTest)
+  file(GLOB py_qa_test_files "qa_*.py")
+  foreach(py_qa_test_file ${py_qa_test_files})
     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
-endforeach(py_qa_test_file)
+  endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-pager/python/__init__.py b/gr-pager/python/pager/__init__.py
index c395d4e458..ea4856fad6 100644
--- a/gr-pager/python/__init__.py
+++ b/gr-pager/python/pager/__init__.py
@@ -24,7 +24,14 @@
 '''
 The GNU Radio pager application.
 '''
+import os
+
+try:
+    from pager_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from pager_swig import *
 
-from pager_swig import *
 from flex_demod import flex_demod
 from pager_utils import *
diff --git a/gr-pager/python/flex_demod.py b/gr-pager/python/pager/flex_demod.py
index 3ed469886c..3ed469886c 100644
--- a/gr-pager/python/flex_demod.py
+++ b/gr-pager/python/pager/flex_demod.py
diff --git a/gr-pager/python/pager_utils.py b/gr-pager/python/pager/pager_utils.py
index e935c86d4b..e935c86d4b 100644
--- a/gr-pager/python/pager_utils.py
+++ b/gr-pager/python/pager/pager_utils.py
diff --git a/gr-pager/python/qa_pager.py b/gr-pager/python/pager/qa_pager.py
index e07291966f..dc9705e292 100755
--- a/gr-pager/python/qa_pager.py
+++ b/gr-pager/python/pager/qa_pager.py
@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import pager_swig as pager
+from gnuradio import gr, gr_unittest, pager
 
 class test_pager(gr_unittest.TestCase):